Resolved conflict in README
Resolved conflict in README