change readme
fix merge conflict