chore:resolve merge conflict in tool_context.py

Author: vrtnis

src/agents/tool_context.py

@@ -46,4 +46,4 @@ def from_agent_context(
         obj = cls(tool_name=tool_name, tool_call_id=tool_call_id, **base_values)
         if hasattr(context, "_event_queue"):
             obj._event_queue = context._event_queue
-        return obj
+        return obj