diff --git a/charts/prometheus-systemd-exporter/Chart.yaml b/charts/prometheus-systemd-exporter/Chart.yaml
index d7b799913450..1506dc5fc3c4 100644
--- a/charts/prometheus-systemd-exporter/Chart.yaml
+++ b/charts/prometheus-systemd-exporter/Chart.yaml
@@ -2,11 +2,7 @@ apiVersion: v2
 name: prometheus-systemd-exporter
 description: A Helm chart for prometheus systemd-exporter
 type: application
-<<<<<<< HEAD
-version: 0.1.1
-=======
 version: 0.2.0
->>>>>>> 83863b25 (feat(systemd-exporter): allow mount extraVolumes)
 appVersion: "0.6.0"
 home: https://github.com/prometheus-community/systemd_exporter
 sources: