Resolve docs conflicts

doc/ci/examples/README.md

@@ -43,15 +43,9 @@ There's also a collection of repositories with [example projects](https://gitlab
 - [Using `dpl` as deployment tool](deployment/README.md)
 - [The `.gitlab-ci.yml` file for GitLab itself](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.gitlab-ci.yml)
 
-<<<<<<< HEAD
 ## Code Quality analysis **[STARTER]**
 
 [Analyze your project's Code Quality](code_quality.md).
-=======
-## Code Quality analysis
-
-**(Starter)** [Analyze your project's Code Quality](code_quality.md).
->>>>>>> upstream/master
 
 ## Dependencies license management **[ULTIMATE]**
 

doc/topics/autodevops/index.md

@@ -297,11 +297,7 @@ out.
 
 In GitLab Starter, differences between the source and
 target branches are also
-<<<<<<< HEAD
 [shown in the merge request widget](../../user/project/merge_requests/code_quality.md).
-=======
-[shown in the merge request widget](https://docs.gitlab.com/ee/user/project/merge_requests/code_quality.html).
->>>>>>> upstream/master
 
 ### Auto SAST **[ULTIMATE]**
 

doc/user/project/merge_requests/index.md

@@ -33,7 +33,6 @@ With GitLab merge requests, you can:
 
 With **[GitLab Enterprise Edition][ee]**, you can also:
 
-<<<<<<< HEAD
 - View the deployment process across projects with [Multi-Project Pipelines](../../../ci/multi_project_pipelines.md#multi-project-pipeline-graphs) **[PREMIUM]**
 - Request [approvals](merge_request_approvals.md) from your managers **[STARTER]**
 - Analyze the impact of your changes with [Code Quality reports](code_quality.md) **[STARTER]**
@@ -43,11 +42,6 @@ With **[GitLab Enterprise Edition][ee]**, you can also:
 - Analyze your dependencies for vulnerabilities with [Dependency Scanning](dependency_scanning.md) **[ULTIMATE]**
 - Analyze your Docker images for vulnerabilities with [Container Scanning](container_scanning.md) **[ULTIMATE]**
 - Determine the performance impact of changes with [Browser Performance Testing](#browser-performance-testing) **[PREMIUM]**
-=======
-- View the deployment process across projects with [Multi-Project Pipeline Graphs](https://docs.gitlab.com/ee/ci/multi_project_pipeline_graphs.html#multi-project-pipeline-graphs) **[PREMIUM]**
-- Request [approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) from your managers **[STARTER]**
-- Analyze the impact of your changes with [Code Quality reports](https://docs.gitlab.com/ee/user/project/merge_requests/code_quality.html) **[STARTER]**
->>>>>>> upstream/master
 
 ## Use cases
 
@@ -55,12 +49,8 @@ A. Consider you are a software developer working in a team:
 
 1. You checkout a new branch, and submit your changes through a merge request
 1. You gather feedback from your team
-<<<<<<< HEAD
 1. You work on the implementation optimizing code with [Code Quality reports](code_quality.md) **[STARTER]**
 1. You avoid using dependencies whose license is not compatible with your project with [License Management reports](license_management.md) **[ULTIMATE]**
-=======
-1. You work on the implementation optimizing code with [Code Quality reports](https://docs.gitlab.com/ee/user/project/merge_requests/code_quality.html) **[STARTER]**
->>>>>>> upstream/master
 1. You build and test your changes with GitLab CI/CD
 1. You request the [approval](#merge-request-approvals) from your manager
 1. Your manager pushes a commit with his final review, [approves the merge request](#merge-request-approvals), and set it to [merge when pipeline succeeds](#merge-when-pipeline-succeeds)