fix merge conflict

Author: wazery

go.mod

@@ -10,16 +10,10 @@ require (
 	github.com/spf13/afero v1.14.0
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.7
-<<<<<<< HEAD
+	github.com/stretchr/testify v1.10.0
 	golang.org/x/mod v0.27.0
 	golang.org/x/text v0.28.0
 	golang.org/x/tools v0.36.0
-=======
-	github.com/stretchr/testify v1.10.0
-	golang.org/x/mod v0.26.0
-	golang.org/x/text v0.27.0
-	golang.org/x/tools v0.35.0
->>>>>>> ba64bd710 (feat(feature-gates) implement feature gates for #849)
 	helm.sh/helm/v3 v3.18.4
 	sigs.k8s.io/yaml v1.6.0
 )