Update README.md

fix conflict