updates readme
fixes merge conflicts