Adds more to README.md
Fixes merge conflict