Resolved conflict in readme