diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 87e252a8..8de9679f 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -21,4 +21,9 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
+<<<<<<< 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)