Fixing Merge Conflicts