Update README.md

resolving merge conflicts