diff --git a/karma/values.yaml b/karma/values.yaml
index 107d28e..e861bc8 100644
--- a/karma/values.yaml
+++ b/karma/values.yaml
@@ -66,7 +66,4 @@ tolerations: []
 
 affinity: {}
 
-<<<<<<< HEAD
 alertmanager_url: "http://alertmanager-main:9093"
-=======
->>>>>>> a689aca1f423ff32b1461cde47af31059dba5ae9