diff --git a/go.sum b/go.sum
index c068e6c9a..c7fc587a4 100644
--- a/go.sum
+++ b/go.sum
@@ -11,12 +11,6 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
 github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
-<<<<<<< HEAD
-github.com/ciscoecosystem/aci-go-client/v2 v2.30.0 h1:u6SjBXtyqWZjYvPC9uMZK8KyD+viv217jGWIKriwo50=
-github.com/ciscoecosystem/aci-go-client/v2 v2.30.0/go.mod h1:NE95j9SraYejTJWqC1SzetCtQ306vQuFIPBbcvm+Hgk=
-=======
-github.com/ciscoecosystem/aci-go-client/v2 v2.28.2 h1:qqglP7joOunBd4JWMKqbqenFfdQfwPAc1JlLzbRZdlI=
-github.com/ciscoecosystem/aci-go-client/v2 v2.28.2/go.mod h1:NE95j9SraYejTJWqC1SzetCtQ306vQuFIPBbcvm+Hgk=
 github.com/ciscoecosystem/aci-go-client/v2 v2.29.0 h1:OCZsWt5uFu7qAdf3YETqHukYTHrSGD23+bavknM7oC8=
 github.com/ciscoecosystem/aci-go-client/v2 v2.29.0/go.mod h1:NE95j9SraYejTJWqC1SzetCtQ306vQuFIPBbcvm+Hgk=
 >>>>>>> 783682cc ([ignore] updated vendor version)