diff --git a/pkg/tools/shell.go b/pkg/tools/shell.go
index bb0a769e4..bfef92ac2 100644
--- a/pkg/tools/shell.go
+++ b/pkg/tools/shell.go
@@ -176,11 +176,8 @@ func NewExecToolWithConfig(
 		customAllowPatterns: customAllowPatterns,
 		allowedPathPatterns: allowedPathPatterns,
 		restrictToWorkspace: restrict,
-<<<<<<< HEAD
 		allowRemote:         allowRemote,
-=======
 		cachedEnv:           cachedEnv,
->>>>>>> 4b11ef32fe1c501baafc615da77c63b952339684
 	}, nil
 }