Cleaning up the Merge Debacle