From 70217cc032a0e3a262e190a47b98addb947c0759 Mon Sep 17 00:00:00 2001
From: Shabana Baig <43451943+s-akhtar-baig@users.noreply.github.com>
Date: Thu, 16 Oct 2025 17:41:28 -0400
Subject: [PATCH] Resolve merge conflicts

---
 .../inline/agents/meta_reference/responses/streaming.py         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llama_stack/providers/inline/agents/meta_reference/responses/streaming.py b/llama_stack/providers/inline/agents/meta_reference/responses/streaming.py
index 896491452..e80ffcdd1 100644
--- a/llama_stack/providers/inline/agents/meta_reference/responses/streaming.py
+++ b/llama_stack/providers/inline/agents/meta_reference/responses/streaming.py
@@ -110,9 +110,9 @@ class StreamingResponseOrchestrator:
         text: OpenAIResponseText,
         max_infer_iters: int,
         tool_executor,  # Will be the tool execution logic from the main class
+        instructions: str,
         safety_api,
         guardrail_ids: list[str] | None = None,
-        instructions: str,
     ):
         self.inference_api = inference_api
         self.ctx = ctx