Resolved merge conflicts

Author: riyaz-ghati

argocd/applications/configs/infra-managers.yaml

@@ -75,7 +75,7 @@ telemetry-manager:
 
 os-resource-manager:
   managerArgs:
-    osProfileRevision: 0.9.1
+    osProfileRevision: 0.9.3
     osSecurityFeatureEnable: false
     inventoryAddress: "inventory.orch-infra.svc.cluster.local:50051"
     traceURL: "orchestrator-observability-opentelemetry-collector.orch-platform.svc:4318"

argocd/applications/templates/web-ui-admin.yaml

@@ -21,7 +21,7 @@ spec:
   sources:
     - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
       chart: orch-ui/charts/orch-ui-admin
-      targetRevision: 3.2.2
+      targetRevision: 3.2.4
       helm:
         releaseName: web-ui
         valuesObject: