resolved conflict in README.me