removing merge conflict messages