Fix conflict in doc/user/project/clusters/index.md

doc/user/project/clusters/index.md

@@ -461,7 +461,6 @@ builds is that they must have a matching
 your build has no `environment:name` set, it will not be passed the Kubernetes
 credentials.
 
-<<<<<<< HEAD
 ## Monitoring your Kubernetes cluster **[ULTIMATE]**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4701) in [GitLab Ultimate][ee] 10.6.
@@ -470,8 +469,6 @@ When [Prometheus is deployed](#installing-applications), GitLab will automatical
 
 ![Cluster Monitoring](img/k8s_cluster_monitoring.png)
 
-=======
->>>>>>> upstream/master
 ## Enabling or disabling the Kubernetes cluster integration
 
 After you have successfully added your cluster information, you can enable the