Modified README.md
changed README
fixed conflict in README