fix conflicts
update README