Updated README.md
Fixed merge conflict