Update README.md
fix conflict from github edit