repairing failed merge