fixing the build: Deleting merge conflict comments