Remove merge conflict markup
Merge pull request #7 from githubnemo/master

Remove merge conflict markup
Thanks for the PR!  Merged.