diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 403aa9b948b..2bdbf623bdc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -15,6 +15,14 @@
 /dev-tools/kubernetes @elastic/elastic-agent-control-plane
 /docs/release-notes @elastic/ingest-docs
 /docs/docset.yml @elastic/ingest-docs
+<<<<<<< HEAD
+=======
+/.github/workflows/update-docs.yml @elastic/ingest-docs
+/docs/reference/edot-collector @elastic/ingest-docs
+/docs/scripts/update-docs @elastic/ingest-docs
+/internal/pkg/otel/samples @elastic/ingest-otel-data @elastic/ingest-docs
+/internal/pkg/otel/core-components.yaml @elastic/ingest-otel-leads
+>>>>>>> 8079da94f (Update code ownership of core-components.yml (#10103))
 /internal/pkg/composable/providers/kubernetes @elastic/elastic-agent-control-plane
 /internal/pkg/otel/samples/darwin/autoops_es.yml @elastic/opex
 /internal/pkg/otel/samples/linux/autoops_es.yml @elastic/opex