Removing merge conflicts.