Repair previous merge