Update README.md
resolving merge conflict