Repair failed merge