Resolved conflicts in README.md