Update README.md
README.md conflict fixed