update with merge