fix merge/tests