sprints and audit work

src/Authority/StellaOps.Authority/StellaOps.Authority.Plugin.Ldap/LdapIdentityProviderPlugin.cs

@@ -25,15 +25,7 @@ internal sealed class LdapIdentityProviderPlugin : IIdentityProviderPlugin
     private readonly LdapCapabilityProbe capabilityProbe;
     private readonly AuthorityIdentityProviderCapabilities manifestCapabilities;
     private readonly SemaphoreSlim capabilityGate = new(1, 1);
-<<<<<<< HEAD
-    private AuthorityIdentityProviderCapabilities capabilities = new(
-        SupportsPassword: false,
-        SupportsMfa: false,
-        SupportsClientProvisioning: false,
-        SupportsBootstrap: false);
-=======
     private AuthorityIdentityProviderCapabilities capabilities = default!; // Initialized via InitializeCapabilities in constructor
->>>>>>> 47890273170663b2236a1eb995d218fe5de6b11a
     private bool clientProvisioningActive;
     private bool bootstrapActive;
     private bool loggedProvisioningDegrade;