edit the readme
fix the merge conflict