My changes for README.md
fix conflict