Resolve index.md

doc/user/project/clusters/index.md

@@ -2,13 +2,10 @@
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/35954) in GitLab 10.1.
 
-<<<<<<< HEAD
 NOTE: **Note:**
 The Cluster integration will eventually supersede the
 [Kubernetes integration](../integrations/kubernetes.md).
 
-=======
->>>>>>> upstream/master
 With a cluster associated to your project, you can use Review Apps, deploy your
 applications, run your pipelines, and much more, in an easy way.
 
@@ -26,11 +23,6 @@ following prerequisites must be met.
   be enabled in GitLab at the instance level. If that's not the case, ask your
   GitLab administrator to enable it.
 - Your associated Google account must have the right privileges to manage
-<<<<<<< HEAD
-  clusters on GKE. That would mean that a
-  [billing account](https://cloud.google.com/billing/docs/how-to/manage-billing-account)
-  must be set up.
-=======
   clusters on GKE. That would mean that a [billing
   account](https://cloud.google.com/billing/docs/how-to/manage-billing-account)
   must be set up and that you have to have permissions to access it.
@@ -39,7 +31,6 @@ following prerequisites must be met.
 - You must have [Cloud Billing API](https://cloud.google.com/billing/) enabled
 - You must have [Resource Manager
   API](https://cloud.google.com/resource-manager/)
->>>>>>> upstream/master
 
 **For an existing Kubernetes cluster:**