force sort queryorder on merge [ci skip]