diff --git a/go.mod b/go.mod
index ca5eed442..b8249ce09 100644
--- a/go.mod
+++ b/go.mod
@@ -93,22 +93,7 @@ require (
 	github.com/yuin/goldmark-emoji v1.0.2 // indirect
 	github.com/zclconf/go-cty v1.14.4 // indirect
 	golang.org/x/crypto v0.25.0 // indirect
-<<<<<<< HEAD
 	golang.org/x/mod v0.19.0 // indirect
-=======
-	golang.org/x/mod v0.17.0 // indirect
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
index a27eaec4b..73a73fd95 100644
--- a/go.sum
+++ b/go.sum
@@ -245,22 +245,6 @@ github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgr
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-<<<<<<< HEAD
-=======
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
 golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
@@ -275,23 +259,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-<<<<<<< HEAD
-=======
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
 golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
 golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
@@ -314,47 +281,10 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-<<<<<<< HEAD
-=======
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
 golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-<<<<<<< HEAD
-=======
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
-=======
->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
->>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035))
 golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
 golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=