Repairing Last Merge