(merge) removing merge conflict