fix conflicts in README.