Changes to README
Fixing merge conflict