removing merge conflicts