update readme
update README conflict