Resolve conflicts in doc/README.md

doc/README.md

@@ -154,15 +154,12 @@ scales to run your tests faster.
 - [GitLab CI/CD](ci/README.md): Explore the features and capabilities of Continuous Integration, Continuous Delivery, and Continuous Deployment with GitLab.
 - [Review Apps](ci/review_apps/index.md): Preview changes to your app right from a merge request.
 - [Pipeline Graphs](ci/pipelines.md#pipeline-graphs)
-<<<<<<< HEAD
 - [Multi-project pipeline graphs](ci/multi_project_pipeline_graphs.md) **[PREMIUM]**
 - [Code Quality](user/project/merge_requests/code_quality_diff.md) **[STARTER]**
 - [Static Application Security Testing (SAST)](user/project/merge_requests/sast.md) **[ULTIMATE]**
 - [Dynamic Application Security Testing (DAST)](user/project/merge_requests/dast.md) **[ULTIMATE]**
 - [Container Scanning](ci/examples/container_scanning.md) **[ULTIMATE]**
 - [Dependency Scanning](ci/examples/dependency_scanning.md) **[ULTIMATE]**
-=======
->>>>>>> upstream/master
 
 ### Package
 
@@ -183,11 +180,8 @@ confidently and securely with GitLab’s built-in Continuous Delivery and Deploy
 - [GitLab Pages](user/project/pages/index.md): Build, test, and deploy a static site directly from GitLab.
 - [Scheduled Pipelines](user/project/pipelines/schedules.md)
 - [Protected Runners](ci/runners/README.md#protected-runners)
-<<<<<<< HEAD
 - [Deploy Boards](user/project/deploy_boards.md): View of the current health and status of each CI environment running on Kubernetes, displaying the status of the pods in the deployment. **[PREMIUM]**
 - [Canary Deployments](user/project/canary_deployments.md): A popular CI strategy, where a small portion of the fleet is updated to the new version first. **[PREMIUM]**
-=======
->>>>>>> upstream/master
 
 ### Configure
 
@@ -199,11 +193,8 @@ configuration. Then customize everything from buildpacks to CI/CD.
 - [Deployment of Helm, Ingress, and Prometheus on Kubernetes](user/project/clusters/index.md#installing-applications)
 - [Protected secret variables](ci/variables/README.md#protected-secret-variables)
 - [Easy creation of Kubernetes clusters on GKE](user/project/clusters/index.md#adding-and-creating-a-new-gke-cluster-via-gitlab)
-<<<<<<< HEAD
 - [Multiple Kubernetes Clusters](user/project/clusters/index.md#multiple-kubernetes-clusters) **[PREMIUM]**
 - [Environment-specific secret variables](ci/variables/README.md#limiting-environment-scopes-of-secret-variables) **[PREMIUM]**
-=======
->>>>>>> upstream/master
 
 ### Monitor