diff --git a/content/rancher/v2.x/en/v1.6-migration/_index.md b/content/rancher/v2.x/en/v1.6-migration/_index.md
index 754ecfbc468..91edab61a1b 100644
--- a/content/rancher/v2.x/en/v1.6-migration/_index.md
+++ b/content/rancher/v2.x/en/v1.6-migration/_index.md
@@ -1,11 +1,6 @@
 ---
 title: Migrating from Rancher v1.6 to v2.x
-<<<<<<< HEAD
-weight: 8500
-draft: true
-=======
 weight: 10000
->>>>>>> removing draft flag
 ---
 
 Rancher 2.0 has been rearchitected and rewritten with the goal of providing a complete management solution for Kubernetes and Docker.  Due to these extensive changes, there is no direct upgrade path from 1.6.x to 2.x, but rather a migration of your 1.6 application workloads into the 2.0 Kubernetes equivalent.  In 1.6, the most common orchestration used was Rancher's own engine called Cattle. The following blogs (that will be converted in an official guide)  explain and educate our Cattle users on running workloads in a Kubernetes environment.