Resolved conflict in README.md