Removing Merge Conflicts