Removed git merge conflict text
Merge pull request #65 from joesondow/remove-git-merge-conflict-text

Removed git merge conflict text