removed git merge conflict text