Repair merge...