Resolve ce-to-ee conflict doc/ci/README.md

doc/ci/README.md

@@ -77,12 +77,9 @@ learn how to leverage its potential even more.
 - [Trigger pipelines on a schedule](../user/project/pipelines/schedules.md)
 - [Kubernetes clusters](../user/project/clusters/index.md) - Integrate one or
   more Kubernetes clusters to your project
-<<<<<<< HEAD
 - [Deploy Boards](../user/project/deploy_boards.md) - Check the current health
   and status of each CI/CD environment running on Kubernetes
 - [ChatOps](chatops/README.md) - Trigger CI jobs from chat, with results sent back to the channel.
-=======
->>>>>>> upstream/master
 - [Interactive web terminal](interactive_web_terminal/index.md) - Open an interactive
   web terminal to debug the running jobs