Updated README.md file.
Fixed readme conflict