diff --git a/packages/derisk-core/src/derisk/agent/core_v2/integration/runtime.py b/packages/derisk-core/src/derisk/agent/core_v2/integration/runtime.py
index b147f445..d90618fc 100644
--- a/packages/derisk-core/src/derisk/agent/core_v2/integration/runtime.py
+++ b/packages/derisk-core/src/derisk/agent/core_v2/integration/runtime.py
@@ -736,7 +736,6 @@ async def _execute_stream(
                     f"[_execute_stream] Injected interaction gateway into agent"
                 )
 
-<<<<<<< HEAD
             # 注入 GptsMemory（用于VIS推送）- backup in case _get_or_create_agent missed it
             if self.gpts_memory and hasattr(agent, "set_gpts_memory"):
                 if not getattr(agent, "_gpts_memory", None):