diff --git a/kubernetes/raspberry/observability/kube-prometheus-stack/app/alertmanager-config.yaml b/kubernetes/raspberry/observability/kube-prometheus-stack/app/alertmanager-config.yaml
index 80929aab..fe1a461b 100644
--- a/kubernetes/raspberry/observability/kube-prometheus-stack/app/alertmanager-config.yaml
+++ b/kubernetes/raspberry/observability/kube-prometheus-stack/app/alertmanager-config.yaml
@@ -29,7 +29,6 @@ spec:
           - name: 'severity'
             value: 'page'
             matchType: '='
->>>>>>> f46cd93 (feat(prom): update alertmanagerconfig)
   receivers:
     - name: 'null'
     - name: 'telegram'