removed merge conflict comments