fix merge tests.