update readme
fix readme conflict