repairing merge