Removed git merge conflict text