Fix conflicts in `doc/ci/README.md`

doc/ci/README.md

@@ -66,14 +66,10 @@ learn how to leverage its potential even more.
   submodules are involved
 - [Auto deploy](autodeploy/index.md)
 - [Use SSH keys in your build environment](ssh_keys/README.md)
-<<<<<<< HEAD
-- [Trigger jobs through the GitLab API](triggers/README.md)
-- [Deploy Boards](../user/project/deploy_boards.md) - Check the current health
-  and status of each CI environment running on Kubernetes
-=======
 - [Trigger pipelines through the GitLab API](triggers/README.md)
 - [Trigger pipelines on a schedule](../user/project/pipelines/schedules.md)
->>>>>>> ce/9-2-stable
+- [Deploy Boards](../user/project/deploy_boards.md) - Check the current health
+  and status of each CI environment running on Kubernete
 ## Review Apps