diff --git a/content/rancher/v2.x/en/installation/ha/_index.md b/content/rancher/v2.x/en/installation/ha/_index.md
index 879f9e78b44..9bfb6cb8e56 100644
--- a/content/rancher/v2.x/en/installation/ha/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/_index.md
@@ -16,10 +16,7 @@ This procedure walks you through setting up a 3-node cluster with RKE and instal
* The Ingress controller will redirect HTTP to HTTPS and terminate SSL/TLS on port TCP/443.
* The Ingress controller will forward traffic to port TCP/80 on the pod in the Rancher deployment.
-<<<<<<< HEAD
-=======
HA Rancher install with layer 4 load balancer, depicting SSL termination at ingress controllers
->>>>>>> adding WIP ha content

HA Rancher install with Layer 4 load balancer (TCP), depicting SSL termination at ingress controllers