Removing merge conflicts