updates readme
fixes conflict