update readme
fix conflict