Updated README
Fixed conflict in README.md