removing merge conflict line