edit readme
fix conflict