diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index deba3c05..87e252a8 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -21,15 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-<<<<<<< HEAD
-<<<<<<< HEAD
     - "[Changed]: Set server.staticAssets.enabled=true since Argo CD 2.0.5 still needs it"
-=======
-    - "[Added]: Support AWS ALB Ingress with gRPC"
-    - "[Deprecated]: Deprecate static assets flag passed to argocd-server"
->>>>>>> fix(argo-cd): Deprecate the static assets flag passed to argocd-server (#846)
-=======
-    - "[Updated]: Updated redis-ha chart dependency 4.12.14 -> 4.12.17"
-    - "[Updated]: Updated dex image 2.27.0 -> 2.28.1"
-    - "[Updated]: Updated redis alpine image 6.2.2 -> 6.2.4"
->>>>>>> argocd - update misc dependencies (#847)