From 738b3592cd1c7c266602697ca2d37cb8e04f26fd Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 15 Jan 2026 05:20:07 +0000
Subject: [PATCH] fix: remove conflict marker in google helper (#875)

---
 src/agents/pi-embedded-helpers/google.ts | 1 -
 1 file changed, 1 deletion(-)

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 }];
     });