resolve conflicts

Author: velotioaastha

Diff for: charts/operator-wandb/charts/app/templates/deployment.yaml

@@ -43,6 +43,9 @@ spec:
       {{- include "wandb.nodeSelector" . | nindent 6 }}
       {{- include "wandb.priorityClassName" . | nindent 6 }}
       {{- include "wandb.podSecurityContext" .Values.pod.securityContext | nindent 6 }}
+      {{- if .Values.topologySpreadConstraints.enabled }}
+        {{- include "wandb.topologySpreadConstraints" (dict "matchLabels" (fromYaml (include "app.labels" .))) | nindent 6 }}
+      {{- end }}
       # Extend the pods shutdown grace period from the default of 30s to 60s.
       # This goes in the pod template spec.
       terminationGracePeriodSeconds: 60