Update readme
Fix merge conflicts