Resolve docs conflicts

doc/README.md

@@ -148,15 +148,12 @@ scales to run your tests faster.
 - [Review Apps](ci/review_apps/index.md): Preview changes to your app right from a merge request.
 - [Pipeline Graphs](ci/pipelines.md#pipeline-graphs)
 - [JUnit test reports](ci/junit_test_reports.md)
-<<<<<<< HEAD
 - [Multi-project pipelines](ci/multi_project_pipelines.md) **[PREMIUM]**
 - [Code Quality reports](user/project/merge_requests/code_quality.md) **[STARTER]**
 - [Static Application Security Testing (SAST) reports](user/project/merge_requests/sast.md) **[ULTIMATE]**
 - [Dynamic Application Security Testing (DAST)](user/project/merge_requests/dast.md) **[ULTIMATE]**
 - [Dependency Scanning reports](user/project/merge_requests/dependency_scanning.md) **[ULTIMATE]**
 - [Container Scanning reports](user/project/merge_requests/container_scanning.md) **[ULTIMATE]**
-=======
->>>>>>> upstream/master
 
 ### Package
 

doc/ci/examples/README.md

@@ -44,13 +44,6 @@ There's also a collection of repositories with [example projects](https://gitlab
 - [The `.gitlab-ci.yml` file for GitLab itself](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.gitlab-ci.yml)
 
 ## Test Reports
-<<<<<<< HEAD
-=======
-
-[Collect test reports in Verify stage](../junit_test_reports.md).
-
-## Code Quality analysis
->>>>>>> upstream/master
 
 [Collect test reports in Verify stage](../junit_test_reports.md).
 

doc/user/project/merge_requests/index.md

@@ -49,17 +49,11 @@ 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 verify your changes with [JUnit test reports](../../../ci/junit_test_reports.md) in GitLab CI/CD
 1. You avoid using dependencies whose license is not compatible with your project with [License Management reports](license_management.md) **[ULTIMATE]**
 1. You request the [approval](#merge-request-approvals) from your manager
 1. Your manager pushes a commit with their final review, [approves the merge request](merge_request_approvals.md), and set it to [merge when pipeline succeeds](#merge-when-pipeline-succeeds) (Merge Request Approvals are available in GitLab Starter)
-=======
-1. You verify your changes with [JUnit test reports](../../../ci/junit_test_reports.md) in GitLab CI/CD
-1. You request the approval from your manager
-1. Your manager pushes a commit with his final review, [approves the merge request](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html), and set it to [merge when pipeline succeeds](#merge-when-pipeline-succeeds) (Merge Request Approvals are available in GitLab Starter)
->>>>>>> upstream/master
 1. Your changes get deployed to production with [manual actions](../../../ci/yaml/README.md#manual-actions) for GitLab CI/CD
 1. Your implementations were successfully shipped to your customer