diff --git a/src/agents/pi-embedded-helpers/google.ts b/src/agents/pi-embedded-helpers/google.ts
index acfc3ebe3..fe3290412 100644
--- a/src/agents/pi-embedded-helpers/google.ts
+++ b/src/agents/pi-embedded-helpers/google.ts
@@ -64,7 +64,6 @@ export function downgradeGeminiThinkingBlocks(messages: AgentMessage[]): AgentMe
       const trimmed = thinking.trim();
       hasDowngraded = true;
       if (!trimmed) return [];
-<<<<<<< HEAD
       return [{ type: "text" as const, text: thinking }];
     });