Resolved conflict in README file