removing merge conflict comment