diff --git a/apps/x/packages/core/src/application/lib/command-executor.ts b/apps/x/packages/core/src/application/lib/command-executor.ts
index af840ecb..611bde45 100644
--- a/apps/x/packages/core/src/application/lib/command-executor.ts
+++ b/apps/x/packages/core/src/application/lib/command-executor.ts
@@ -276,11 +276,7 @@ export function executeCommandSync(
       cwd: options?.cwd,
       timeout: options?.timeout,
       encoding: 'utf-8',
-<<<<<<< HEAD
-      shell: getShell(),
-=======
       shell: EXECUTION_SHELL,
->>>>>>> dev
     });
 
     return {