OSDOCS-1575 updated topic map

Author: wgabor0427

_topic_maps/_topic_map.yml

@@ -1238,15 +1238,12 @@ Topics:
     File: zero-trust-manager-install
   - Name: Deploying Zero Trust Workload Identity Manager operands
     File: zero-trust-manager-configuration
-<<<<<<< HEAD
   - Name: Configuring Zero Trust Workload Identity Manager OIDC Federation
     File: zero-trust-manager-oidc-federation
   - Name: Enabling create-only mode for the Zero Trust Workload Identity Manager
     File: zero-trust-manager-reconciliation
-=======
   - Name: Zero Trust Workload Identity Manager upstream authority plugins
     File: zero-trust-manager-upstream-authority
->>>>>>> 892f2e1a00 (OSDOCS-15575 updated several modules)
   - Name: Monitoring Zero Trust Workload Identity Manager
     File: zero-trust-manager-monitoring
   - Name: Uninstalling the Zero Trust Workload Identity Manager