Fix conflicts on ci/yaml README

doc/ci/yaml/README.md

@@ -1714,13 +1714,8 @@ capitalization, the commit will be created but the pipeline will be skipped.
 ## Validate the .gitlab-ci.yml
 
 Each instance of GitLab CI has an embedded debug tool called Lint, which validates the
-<<<<<<< HEAD
-content of your `.gitlab-ci.yml` files. You can find the Lint under the page `ci/lint` of your
-project namespace (e.g, `http://gitlab-example.com/gitlab-org/project-123/ci/lint`)
-=======
 content of your `.gitlab-ci.yml` files. You can find the Lint under the page `ci/lint` of your 
 project namespace (e.g, `http://gitlab-example.com/gitlab-org/project-123/-/ci/lint`)
->>>>>>> upstream/master
 
 ## Using reserved keywords