I modify readme
fix conflict