diff --git a/src/commands/doctor-legacy-config.migrations.test.ts b/src/commands/doctor-legacy-config.migrations.test.ts
index 51601d20024..fcbbf54d728 100644
--- a/src/commands/doctor-legacy-config.migrations.test.ts
+++ b/src/commands/doctor-legacy-config.migrations.test.ts
@@ -232,15 +232,7 @@ describe("normalizeCompatibilityConfigValues", () => {
     );
 
     expect(res.config.channels?.discord?.streaming).toBe("block");
-<<<<<<< HEAD
-    expect(
-      (res.config.channels?.discord as Record<string, unknown> | undefined)?.streamMode,
-    ).toBeUndefined();
-||||||| parent of 82b78a0a86 (fix: align config and plugin test types)
-    expect(res.config.channels?.discord?.streamMode).toBeUndefined();
-=======
     expect(getLegacyProperty(res.config.channels?.discord, "streamMode")).toBeUndefined();
->>>>>>> 82b78a0a86 (fix: align config and plugin test types)
     expect(res.changes).toEqual([
       "Moved channels.discord.streamMode → channels.discord.streaming (block).",
       "Normalized channels.discord.streaming boolean → enum (block).",
@@ -259,15 +251,7 @@ describe("normalizeCompatibilityConfigValues", () => {
     );
 
     expect(res.config.channels?.telegram?.streaming).toBe("block");
-<<<<<<< HEAD
-    expect(
-      (res.config.channels?.telegram as Record<string, unknown> | undefined)?.streamMode,
-    ).toBeUndefined();
-||||||| parent of 82b78a0a86 (fix: align config and plugin test types)
-    expect(res.config.channels?.telegram?.streamMode).toBeUndefined();
-=======
     expect(getLegacyProperty(res.config.channels?.telegram, "streamMode")).toBeUndefined();
->>>>>>> 82b78a0a86 (fix: align config and plugin test types)
     expect(res.changes).toEqual([
       "Moved channels.telegram.streamMode → channels.telegram.streaming (block).",
     ]);
@@ -287,15 +271,7 @@ describe("normalizeCompatibilityConfigValues", () => {
 
     expect(res.config.channels?.slack?.streaming).toBe("progress");
     expect(res.config.channels?.slack?.nativeStreaming).toBe(false);
-<<<<<<< HEAD
-    expect(
-      (res.config.channels?.slack as Record<string, unknown> | undefined)?.streamMode,
-    ).toBeUndefined();
-||||||| parent of 82b78a0a86 (fix: align config and plugin test types)
-    expect(res.config.channels?.slack?.streamMode).toBeUndefined();
-=======
     expect(getLegacyProperty(res.config.channels?.slack, "streamMode")).toBeUndefined();
->>>>>>> 82b78a0a86 (fix: align config and plugin test types)
     expect(res.changes).toEqual([
       "Moved channels.slack.streamMode → channels.slack.streaming (progress).",
       "Moved channels.slack.streaming (boolean) → channels.slack.nativeStreaming (false).",
diff --git a/src/plugins/contracts/tts.contract.test.ts b/src/plugins/contracts/tts.contract.test.ts
index ac9a3a73199..72febf8f399 100644
--- a/src/plugins/contracts/tts.contract.test.ts
+++ b/src/plugins/contracts/tts.contract.test.ts
@@ -650,25 +650,6 @@ describe("tts", () => {
 
   describe("resolveTtsConfig provider normalization", () => {
     it("normalizes legacy edge provider ids to microsoft", () => {
-<<<<<<< HEAD
-      const config = resolveTtsConfig(
-        asLegacyOpenClawConfig({
-          agents: { defaults: { model: { primary: "openai/gpt-4o-mini" } } },
-          messages: {
-            tts: {
-              provider: "edge",
-              edge: {
-                enabled: true,
-              },
-||||||| parent of 82b78a0a86 (fix: align config and plugin test types)
-      const config = resolveTtsConfig({
-        agents: { defaults: { model: { primary: "openai/gpt-4o-mini" } } },
-        messages: {
-          tts: {
-            provider: "edge",
-            edge: {
-              enabled: true,
-=======
       const config = resolveTtsConfig(
         asLegacyTtsConfig({
           agents: { defaults: { model: { primary: "openai/gpt-4o-mini" } } },
@@ -678,7 +659,6 @@ describe("tts", () => {
               edge: {
                 enabled: true,
               },
->>>>>>> 82b78a0a86 (fix: align config and plugin test types)
             },
           },
         }),
@@ -1008,13 +988,7 @@ describe("tts", () => {
           },
         },
       },
-<<<<<<< HEAD
     });
-||||||| parent of 82b78a0a86 (fix: align config and plugin test types)
-    };
-=======
-    } as unknown as OpenClawConfig;
->>>>>>> 82b78a0a86 (fix: align config and plugin test types)
 
     const withMockedAutoTtsFetch = async (
       run: (fetchMock: ReturnType<typeof vi.fn>) => Promise<void>,