diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index c659a251..c7a7f01e 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -343,7 +343,6 @@ Node classes list of onprem provider.
## onprem.monitoring
-<<<<<<< HEAD
**diagrams.onprem.monitoring.Cortex**
@@ -386,21 +385,6 @@ Node classes list of onprem provider.
**diagrams.onprem.monitoring.Zabbix**
-=======
-- **diagrams.onprem.monitoring.Cortex**
-- **diagrams.onprem.monitoring.Datadog**
-- **diagrams.onprem.monitoring.Dynatrace**
-- **diagrams.onprem.monitoring.Grafana**
-- **diagrams.onprem.monitoring.Humio**
-- **diagrams.onprem.monitoring.Nagios**
-- **diagrams.onprem.monitoring.Newrelic**
-- **diagrams.onprem.monitoring.PrometheusOperator**
-- **diagrams.onprem.monitoring.Prometheus**
-- **diagrams.onprem.monitoring.Sentry**
-- **diagrams.onprem.monitoring.Splunk**
-- **diagrams.onprem.monitoring.Thanos**
-- **diagrams.onprem.monitoring.Zabbix**
->>>>>>> fdbd469 (add support for Scaleway products)
## onprem.network