diff --git a/deploy/cephfs/helm/Chart.yaml b/deploy/cephfs/helm/Chart.yaml
index 35fd2dd91..dc94bb2af 100644
--- a/deploy/cephfs/helm/Chart.yaml
+++ b/deploy/cephfs/helm/Chart.yaml
@@ -4,11 +4,7 @@ appVersion: "1.0.0"
 description: "Container Storage Interface (CSI) driver,
 provisioner, and attacher for Ceph cephfs"
 name: ceph-csi-cephfs
-<<<<<<< HEAD
 version: 0.6.0
-=======
-version: 0.5.3
->>>>>>> 882bebf1d8507d6bcd4b4bfae23a861057353785
 keywords:
   - ceph
   - cephfs
diff --git a/deploy/rbd/helm/Chart.yaml b/deploy/rbd/helm/Chart.yaml
index 15debafe0..a36450e34 100644
--- a/deploy/rbd/helm/Chart.yaml
+++ b/deploy/rbd/helm/Chart.yaml
@@ -4,11 +4,7 @@ appVersion: "1.0.0"
 description: "Container Storage Interface (CSI) driver,
 provisioner, snapshotter, and attacher for Ceph RBD"
 name: ceph-csi-rbd
-<<<<<<< HEAD
 version: 0.6.0
-=======
-version: 0.5.3
->>>>>>> 882bebf1d8507d6bcd4b4bfae23a861057353785
 keywords:
   - ceph
   - rbd