Update README.md
Fixed conflict in README.md