Resolved conflict in README