Removed the git error conflict comments.