Repair good merge