Repairing merge