merge repair