Updated README.md
resolved README.md conflict