modified readme
fix conflict