Removed mergetool conflict comments