diff --git a/karma/Chart.yaml b/karma/Chart.yaml
index 1923dad..2c3a220 100644
--- a/karma/Chart.yaml
+++ b/karma/Chart.yaml
@@ -18,6 +18,6 @@ version: 0.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.99
+appVersion: v0.101
 
 icon: https://git.ervine.org/jonny/charts/raw/branch/master/karma/karma.png
diff --git a/karma/values.yaml b/karma/values.yaml
index e861bc8..107d28e 100644
--- a/karma/values.yaml
+++ b/karma/values.yaml
@@ -66,4 +66,7 @@ tolerations: []
 
 affinity: {}
 
+<<<<<<< HEAD
 alertmanager_url: "http://alertmanager-main:9093"
+=======
+>>>>>>> a689aca1f423ff32b1461cde47af31059dba5ae9