rename deep_update -> merge