From b111812d6e1fb6e5cb24130c61deb45c4bba1cee Mon Sep 17 00:00:00 2001
From: Mark Bishop <mark@rancher.com>
Date: Thu, 9 Aug 2018 18:12:21 -0700
Subject: [PATCH] fixing conflicts

---
 .../rke-clusters/options/_index.md              | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md
index 5a868b024e5..72151f403fa 100644
--- a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md
+++ b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md
@@ -20,14 +20,6 @@ From this section you can choose:
 
 - Whether Rancher should check if the nodes are running a supported or unsupported version of Docker. If you only allow supported versions, the cluster automatically fails to launch if you have an unsupported version of Docker. Each Kubernetes version is tied to specific Docker versions based on what Kubernetes tests against.
 
-<<<<<<< HEAD
-- The [Network Provider](https://kubernetes.io/docs/concepts/cluster-administration/networking/) that the cluster uses. 
-
-    >**Note:** After you launch the cluster, you cannot change your network provider. Therefore, choose which network provider you want to use carefully, as Kubernetes doesn't allow switching between network providers. Once a cluster is created with a network provider, changing network providers would require you  tear down the entire cluster and all its applications.
-<!-- - The [Network Provider](https://kubernetes.io/docs/concepts/cluster-administration/networking/) that the cluster uses. Out of the box, Rancher supports:
-    
-    - <a id="canal"></a>**[Canal](https://github.com/projectcalico/canal)**: In v2.0.0 - v2.0.4 and v2.0.6, this was the default option for these clusters was Canal with network isolation. With the network isolation automatically enabled, it prevented any pod communication between [projects]({{< baseurl >}}/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/).-->
-=======
 <!--
 
 - The [Network Provider](https://kubernetes.io/docs/concepts/cluster-administration/networking/) that the cluster uses. Out of the box, Rancher supports:
@@ -38,32 +30,23 @@ From this section you can choose:
 - The [Network Provider](https://kubernetes.io/docs/concepts/cluster-administration/networking/) that the cluster uses. 
 
     >**Note:** After you launch the cluster, you cannot change your network provider. Therefore, choose which network provider you want to use carefully, as Kubernetes doesn't allow switching between network providers. Once a cluster is created with a network provider, changing network providers would require you  tear down the entire cluster and all its applications.
->>>>>>> commenting out 2.0.7 docs
 
     Out of the box, Rancher supports the following network providers:
 
     - [Canal](https://github.com/projectcalico/canal)
     
-<<<<<<< HEAD
-        The default networking option for cluster networking in all Rancher releases, with the exception of v2.0.5. <!--As of release v2.0.7, if you use Canal, you also have the option of **Project Network Isolation**, which will enable or disable communication between pods in different [projects]({{< baseurl >}}/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/).
-=======
         The default networking option for cluster networking in all Rancher releases, with the exception of v2.0.5. 
         
         <!-- 
         
         As of release v2.0.7, if you use Canal, you also have the option of **Project Network Isolation**, which will enable or disable communication between pods in different [projects]({{< baseurl >}}/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/).
->>>>>>> commenting out 2.0.7 docs
     
         >**Attention Rancher v2.0.0 - v2.0.6 Users**
         >
         >- In previous Rancher releases, Canal isolates project network communications with no option to disable it. If you are using any of these Rancher releases, be aware that using Canal prevents all communication between pods in different projects.
-<<<<<<< HEAD
-        >- If you are have clusters using Canal and are upgrading to v2.0.7, those clusters enable Project Network Isolation by default. If you want to disable Project Network Isolation, edit the cluster and disable the option.-->
-=======
         >- If you are have clusters using Canal and are upgrading to v2.0.7, those clusters enable Project Network Isolation by default. If you want to disable Project Network Isolation, edit the cluster and disable the option. 
         
         -->
->>>>>>> commenting out 2.0.7 docs
 
     - [Flannel](https://github.com/coreos/flannel#flannel)