resolved conflict in readme