merge stest -> default