diff --git a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md
index 48d880bfb14..97914bd4f77 100644
--- a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md
@@ -3,11 +3,7 @@ title: 3 - Initialize Helm (Install tiller)
 weight: 195
 ---
 
-<<<<<<< HEAD
-Helm is the package management tool of choice for Kubernetes. Helm charts provide templating syntax for Kubernetes YAML manifest documents. With Helm we can create configurable deployments instead of just using static files. For more information about creating your own catalog of deployments, check out the docs at [https://helm.sh/](https://helm.sh/).
-=======
 Helm is the package management tool of choice for Kubernetes. Helm "charts" provide templating syntax for Kubernetes YAML manifest documents. With Helm we can create configurable deployments instead of just using static files. For more information about creating your own catalog of deployments, check out the docs at [https://helm.sh/](https://helm.sh/). To be able to use Helm, the server-side component `tiller` needs to be installed on your cluster.
->>>>>>> Cleanup helm/tiller + added verification steps for helm/tiller
 
 > **Note:** For systems without direct internet access see [Helm - Air Gap]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#helm) for install details.
 
@@ -16,13 +12,8 @@ Helm is the package management tool of choice for Kubernetes. Helm "charts" prov
 Helm installs the `tiller` service on your cluster to manage charts. Since RKE enables RBAC by default we will need to use `kubectl` to create a `serviceaccount` and `clusterrolebinding` so `tiller` has permission to deploy to the cluster.
 
 * Create the `ServiceAccount` in the `kube-system` namespace.
-<<<<<<< HEAD
 * Create the `ClusterRoleBinding` to give the `tiller` service account access to the cluster.
-* Finally use `helm` to initialize the `tiller` service
-=======
-* Create the `ClusterRoleBinding` to give the `tiller` account access to the cluster.
 * Finally use `helm` to install the `tiller` service
->>>>>>> Cleanup helm/tiller + added verification steps for helm/tiller
 
 ```plain
 kubectl -n kube-system create serviceaccount tiller