diff --git a/packages/opencode/src/tool/bash.ts b/packages/opencode/src/tool/bash.ts
index 52084eb3fb..ff18e15e39 100644
--- a/packages/opencode/src/tool/bash.ts
+++ b/packages/opencode/src/tool/bash.ts
@@ -78,11 +78,7 @@ const getShell = lazy(() => {
 
 // TODO: we may wanna rename this tool so it works better on other shells
 export const BashTool = Tool.define("bash", async () => {
-<<<<<<< HEAD
-  const shell = getShell()
-=======
   const shell = Shell.acceptable()
->>>>>>> dev
   log.info("bash tool using shell", { shell })
 
   return {