Fixing Merges