diff --git a/content/rancher/v2.x/en/upgrades/upgrades/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/_index.md
index 56bc36708c9..f9d839a4450 100644
--- a/content/rancher/v2.x/en/upgrades/upgrades/_index.md
+++ b/content/rancher/v2.x/en/upgrades/upgrades/_index.md
@@ -10,9 +10,18 @@ This section contains information about how to upgrade your Rancher server to a
 - [Upgrading an Air Gapped Single Node Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/single-node-air-gap-upgrade/)
 
 ### HA Install with Helm Chart
+<<<<<<< HEAD
+=======
+
+>>>>>>> editing and formatting for helm upgrade
 - [Upgrading a High Availability Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/)
 
 ### HA Install with RKE Add-On yaml
 
+<<<<<<< HEAD
 - [Migrating from a High Availability RKE Add-on Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/)
-- [Upgrading a High Availability Install - RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/)
\ No newline at end of file
+- [Upgrading a High Availability Install - RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/)
+=======
+- [Migrating from a High Availability RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/)
+- [Upgrading a High Availability Install - RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/)
+>>>>>>> editing and formatting for helm upgrade