Update README.md

Not sure if I fixed the merge conflict