Update readme
fix merge