Update README.md
solved conflict