update readme
fix merge