Fixing the Merge