Repair broken merge