fix: rebase issues

Author: faiq

hack/addons/kustomize/cluster-autoscaler/manifests/helm-values.yaml

@@ -4,15 +4,9 @@
 # This is used to generate CRS
 ---
 # This is a hack, but because a single cluster-autoscaler deployment can only monitor a single Kubernetes cluster
-<<<<<<< HEAD
 # we expect 'tmp-clustername-tmpl', 'tmpl-clusternamespace-tmpl' and 'tmpl-clusteruuid-tmpl'
 # to be replaced with the Cluster's name and namespace.
 fullnameOverride: cluster-autoscaler-tmpl-clusteruuid-tmpl
-=======
-# we expect 'tmpl-clustername-tmpl' and 'tmpl-clusternamespace-tmpl'
-# to be replaced with the Cluster's name and namespace.
-fullnameOverride: cluster-autoscaler-tmpl-clustername-tmpl
->>>>>>> c13903e (ci: adds missing helm-values files to generate cm)
 
 cloudProvider: clusterapi
 
@@ -39,11 +33,7 @@ clusterAPIMode: kubeconfig-incluster
 clusterAPIWorkloadKubeconfigPath: /cluster/kubeconfig
 extraVolumeSecrets:
   kubeconfig:
-<<<<<<< HEAD
     name: tmpl-clusteruuid-tmpl-kubeconfig
-=======
-    name: tmpl-clustername-tmpl-kubeconfig
->>>>>>> c13903e (ci: adds missing helm-values files to generate cm)
     mountPath: /cluster
     readOnly: true
     items: