Update README.md
fixing merge conflicts