fix the conflicts in README.md