Update README.md
Merge conflict