Update README.md

resolved conflict