Update README.md

Removes merge conflict artifact