diff --git a/packages/opencode/src/plugin/index.ts b/packages/opencode/src/plugin/index.ts
index d4a9432af..2f10e88e9 100644
--- a/packages/opencode/src/plugin/index.ts
+++ b/packages/opencode/src/plugin/index.ts
@@ -28,11 +28,8 @@ import { parsePluginSpecifier, readPluginId, readV1Plugin, resolvePluginId } fro
 import { registerAdapter } from "@/control-plane/adapters"
 import type { WorkspaceAdapter } from "@/control-plane/types"
 import { RuntimeFlags } from "@/effect/runtime-flags"
-<<<<<<< HEAD
 import { EventV2Bridge } from "@/event-v2-bridge"
-=======
 import { InstallationChannel } from "@opencode-ai/core/installation/version"
->>>>>>> origin/dev
 
 const log = Log.create({ service: "plugin" })
 
@@ -258,17 +255,6 @@ export const layer = Layer.effect(
           }).pipe(Effect.ignore)
         }
 
-<<<<<<< HEAD
-        const unsubscribe = yield* events.listen((event) => {
-          if (event.location?.directory !== ctx.directory) return Effect.void
-          return Effect.sync(() => {
-            for (const hook of hooks) {
-              void hook["event"]?.({ event: { id: event.id, type: event.type, properties: event.data } as any })
-            }
-          })
-        })
-        yield* Effect.addFinalizer(() => unsubscribe)
-=======
         yield* Effect.addFinalizer(() =>
           Effect.forEach(
             hooks,
@@ -283,18 +269,15 @@ export const layer = Layer.effect(
           ),
         )
 
-        // Subscribe to bus events, fiber interrupted when scope closes
-        yield* (yield* bus.subscribeAll()).pipe(
-          Stream.runForEach((input) =>
-            Effect.sync(() => {
-              for (const hook of hooks) {
-                void hook["event"]?.({ event: input as any })
-              }
-            }),
-          ),
-          Effect.forkScoped,
-        )
->>>>>>> origin/dev
+        const unsubscribe = yield* events.listen((event) => {
+          if (event.location?.directory !== ctx.directory) return Effect.void
+          return Effect.sync(() => {
+            for (const hook of hooks) {
+              void hook["event"]?.({ event: { id: event.id, type: event.type, properties: event.data } as any })
+            }
+          })
+        })
+        yield* Effect.addFinalizer(() => unsubscribe)
 
         return { hooks }
       }),
diff --git a/packages/opencode/test/provider/provider.test.ts b/packages/opencode/test/provider/provider.test.ts
index 6bad152fc..c05547657 100644
--- a/packages/opencode/test/provider/provider.test.ts
+++ b/packages/opencode/test/provider/provider.test.ts
@@ -282,14 +282,9 @@ it.instance(
     const providers = yield* list
     expect(providers[ProviderV2.ID.anthropic]).toBeDefined()
     // Config options should be merged
-<<<<<<< HEAD
     expect(providers[ProviderV2.ID.anthropic].options.timeout).toBe(60000)
+    expect(providers[ProviderV2.ID.anthropic].options.headerTimeout).toBe(10000)
     expect(providers[ProviderV2.ID.anthropic].options.chunkTimeout).toBe(15000)
-=======
-    expect(providers[ProviderID.anthropic].options.timeout).toBe(60000)
-    expect(providers[ProviderID.anthropic].options.headerTimeout).toBe(10000)
-    expect(providers[ProviderID.anthropic].options.chunkTimeout).toBe(15000)
->>>>>>> origin/dev
   }),
   { config: { provider: { anthropic: { options: { timeout: 60000, headerTimeout: 10000, chunkTimeout: 15000 } } } } },
 )
diff --git a/packages/opencode/test/session/retry.test.ts b/packages/opencode/test/session/retry.test.ts
index 7066f5c50..2b70cf6ae 100644
--- a/packages/opencode/test/session/retry.test.ts
+++ b/packages/opencode/test/session/retry.test.ts
@@ -7,12 +7,7 @@ import { Effect, Layer, Schedule, Schema } from "effect"
 import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
 import { SessionRetry } from "../../src/session/retry"
 import { MessageV2 } from "../../src/session/message-v2"
-<<<<<<< HEAD
-
-=======
-import { ProviderID } from "../../src/provider/schema"
 import { ProviderError } from "../../src/provider/error"
->>>>>>> origin/dev
 import { SessionID } from "../../src/session/schema"
 import { SessionStatus } from "../../src/session/status"
 import { testEffect } from "../lib/effect"