fix merge issue

control-plane/go.mod

@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul-k8s/control-plane
 
-replace github.com/hashicorp/consul/api => github.com/hashicorp/consul/api v1.10.1-0.20240312203720-262f4358003f
+replace github.com/hashicorp/consul/api => github.com/hashicorp/consul/api v1.10.1-0.20240313190037-2c0e2f0acd24
 
 require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
@@ -165,5 +165,3 @@ require (
 )
 
 go 1.21
-
-replace github.com/hashicorp/consul/api => github.com/hashicorp/consul/api v1.10.1-0.20240313190037-2c0e2f0acd24

control-plane/go.sum

@@ -275,8 +275,8 @@ github.com/hashicorp/consul-k8s/control-plane/cni v0.0.0-20240226161840-f3842c41
 github.com/hashicorp/consul-k8s/control-plane/cni v0.0.0-20240226161840-f3842c41cb2b/go.mod h1:9NKJHOcgmz/6P2y6MegNIOXhIKE/0ils/mHWd5sZgoU=
 github.com/hashicorp/consul-server-connection-manager v0.1.6 h1:ktj8Fi+dRXn9hhM+FXsfEJayhzzgTqfH08Ne5M6Fmug=
 github.com/hashicorp/consul-server-connection-manager v0.1.6/go.mod h1:HngMIv57MT+pqCVeRQMa1eTB5dqnyMm8uxjyv+Hn8cs=
-github.com/hashicorp/consul/api v1.10.1-0.20240305213446-e5825b62e7ee h1:O2MZHSJii5hxvZsfrEyyyPAaQJw/LAfonOrTBIAH2jY=
-github.com/hashicorp/consul/api v1.10.1-0.20240305213446-e5825b62e7ee/go.mod h1:GmIks4tBN5K6CD5UG2yS5IHR/UryqfZ31YBqPh/pA8E=
+github.com/hashicorp/consul/api v1.10.1-0.20240313190037-2c0e2f0acd24 h1:urOuwKiajW1jPC/r/lngnGIzCZC0rEYenEiPFn3/2gc=
+github.com/hashicorp/consul/api v1.10.1-0.20240313190037-2c0e2f0acd24/go.mod h1:GmIks4tBN5K6CD5UG2yS5IHR/UryqfZ31YBqPh/pA8E=
 github.com/hashicorp/consul/proto-public v0.6.0 h1:9qrBujmoTB5gQQ84kQO+YWvhjgYoYBNrOoHdo4cpHHM=
 github.com/hashicorp/consul/proto-public v0.6.0/go.mod h1:JF6983XNCzvw4wDNOLEwLqOq2IPw7iyT+pkswHSz08U=
 github.com/hashicorp/consul/sdk v0.16.0 h1:SE9m0W6DEfgIVCJX7xU+iv/hUl4m/nxqMTnCdMxDpJ8=