update README
update README
update CONFLICT