Update README.md

fixed merge conflict