merge in update