update /readme
solve readme.md conflict