added a thing to readme
fixed merge conflicts in README
fixed merge conflicts in README