resolve conflict in README.md