Update readme
fix merge conflict