Update README.md

Fix merge issue with readme and made the readme reflect the new changes.