diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index f8cc6769..941238ac 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.9.6
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.53.14
+version: 5.54.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -26,10 +26,5 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-<<<<<<< HEAD
-    - kind: changed
-      description: refresh from upstream
-=======
     - kind: added
       description: Add Probes for redis
->>>>>>> 8adc4c1 (feat(argo-cd): Add Probes for redis)