update and merge