resolved conflicts in README.md