removing merge conflict error