diff --git a/packages/opencode/src/session/index.ts b/packages/opencode/src/session/index.ts
index 614eea601..fe8958f8a 100644
--- a/packages/opencode/src/session/index.ts
+++ b/packages/opencode/src/session/index.ts
@@ -39,13 +39,9 @@ import { ReadTool } from "../tool/read"
 import { mergeDeep, pipe, splitWhen } from "remeda"
 import { ToolRegistry } from "../tool/registry"
 import { Plugin } from "../plugin"
-<<<<<<< HEAD
 import { Project } from "../project/project"
-
 import { Instance } from "../project/instance"
-=======
 import { Agent } from "../agent/agent"
->>>>>>> dev
 
 export namespace Session {
   const log = Log.create({ service: "session" })