diff --git a/go.mod b/go.mod
index 0b672e5..78707c1 100644
--- a/go.mod
+++ b/go.mod
@@ -83,10 +83,7 @@ require (
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-<<<<<<< HEAD
 	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
-=======
->>>>>>> worktree-agent-a282d1fe
 	golang.org/x/sync v0.20.0 // indirect
 	golang.org/x/sys v0.42.0 // indirect
 	golang.org/x/text v0.35.0 // indirect