Update README.md
fix conflicts