update
update and merge