Update README.md
Fixed conflict on README