Update README.md

Fixing merge conflicts.