Small changes to readme
Merge conflict