update readme
fix merge conflict