Update README.md

Create a merge conflict