Remove merge conflicts.