removing merge conflict