diff --git a/tests/unit/triage-bugs-2026-08-02.test.ts b/tests/unit/triage-bugs-2026-08-02.test.ts
index d27536dba9..88a7cbb300 100644
--- a/tests/unit/triage-bugs-2026-08-02.test.ts
+++ b/tests/unit/triage-bugs-2026-08-02.test.ts
@@ -42,26 +42,6 @@ test("non-GPT-5.6 models still get max downgraded to xhigh", () => {
     )
   );
   assert.equal(translated.reasoning_effort, "xhigh");
-<<<<<<< HEAD
-});
-
-// ─────────────────────────────────────────────────────────────────────
-// PR #9142 — Anthropic top-level `system` prompts must trigger background detection
-// ─────────────────────────────────────────────────────────────────────
-const { getBackgroundTaskReason, setBackgroundDegradationConfig } =
-  await import("../../open-sse/services/backgroundTaskDetector.ts");
-
-test("#9142 Anthropic top-level system prompts must trigger background detection", () => {
-  setBackgroundDegradationConfig({ enabled: true });
-  assert.equal(
-    getBackgroundTaskReason({
-      system: "Generate a title for this conversation",
-      messages: [{ role: "user", content: "hello" }],
-    }),
-    "system_prompt_pattern"
-  );
-});
-=======
 
 // #9140 — VS Code routes filter out built-in auto models
 const { isUsableChatModel } = await import(
@@ -79,4 +59,3 @@ test("#9140 VS Code listing must accept built-in auto routing entries", () => {
     false,
     "operator-created combo should still be rejected"
   );
->>>>>>> origin/release/v3.8.50