Update readme
Merge conflicts