diff --git a/charts/paradedb/test/paradedb-enterprise/01-paradedb-NCC-1701-D_cluster.yaml b/charts/paradedb/test/paradedb-enterprise/01-paradedb-NCC-1701-D_cluster.yaml
index 7c9b8da92..829b5e538 100644
--- a/charts/paradedb/test/paradedb-enterprise/01-paradedb-NCC-1701-D_cluster.yaml
+++ b/charts/paradedb/test/paradedb-enterprise/01-paradedb-NCC-1701-D_cluster.yaml
@@ -2,11 +2,7 @@ type: paradedb-enterprise
 mode: standalone
 version:
   major: "17"
-<<<<<<< HEAD
   paradedb: "0.15.1"
-=======
-  paradedb: "0.15.0"
->>>>>>> 0d458f5 (chore: Upgrade to 0.15.0 (#80))
 cluster:
   instances: 2
   storage: