Removing merge conflict