Update readme
fix merge conflicts