Update README.md
this fixes a merge conflict