The non-empty merge case now covers the gateway-timestamp override, the exact api_content sidecar and the token estimate in one test; the empty-turn test is unchanged.