A few additions to README.md
conflict resolved