Update README.md

Fix merge conflicts.