diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index 561a7580..6700497e 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -55,16 +55,11 @@ spec:
         {{- if .Values.redis.enabled }}
         - --redis
         - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
-        {{- end }}
+        {{- Send }}
         - --loglevel
         - {{ .Values.repoServer.logLevel }}
-<<<<<<< HEAD
         {{- with .Values.repoServer.extraArgs }}
         {{- . | toYaml | nindent 8 }}
-=======
-        {{- with .Values.controller.extraArgs }}
-        {{  . | toYaml | nindent 8 }}
->>>>>>> feat: extraArgs allows same flag multiple times
         {{- end }}
         {{- if .Values.repoServer.containerSecurityContext }}
         securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}