Update README.md
resolving merge conflict in README