From 8a3531e821b44cd38c33f7c2cce2ee4241d2c3f0 Mon Sep 17 00:00:00 2001
From: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Date: Wed, 19 Nov 2025 10:16:52 -0500
Subject: [PATCH] Fix merge issues

---
 .../OrganizationUserControllerAutoConfirmTests.cs      | 10 +++++-----
 .../AdminConsole/AutoFixture/OrganizationFixtures.cs   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/Api.IntegrationTest/AdminConsole/Controllers/OrganizationUserControllerAutoConfirmTests.cs b/test/Api.IntegrationTest/AdminConsole/Controllers/OrganizationUserControllerAutoConfirmTests.cs
index 02103c7040..3dcb848820 100644
--- a/test/Api.IntegrationTest/AdminConsole/Controllers/OrganizationUserControllerAutoConfirmTests.cs
+++ b/test/Api.IntegrationTest/AdminConsole/Controllers/OrganizationUserControllerAutoConfirmTests.cs
@@ -39,7 +39,7 @@ public class OrganizationUserControllerAutoConfirmTests : IClassFixture<ApiAppli
         _loginHelper = new LoginHelper(_factory, _client);
     }
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
     {
         _ownerEmail = $"org-owner-{Guid.NewGuid()}@example.com";
         await _factory.LoginWithNewAccount(_ownerEmail);
@@ -144,7 +144,7 @@ public class OrganizationUserControllerAutoConfirmTests : IClassFixture<ApiAppli
         var collections = await collectionRepository.GetManyByUserIdAsync(organizationUser.UserId!.Value);
 
         Assert.NotEmpty(collections);
-        Assert.Single(collections.Where(c => c.Type == CollectionType.DefaultUserCollection));
+        Assert.Single(collections, c => c.Type == CollectionType.DefaultUserCollection);
 
         await _factory.GetService<IOrganizationRepository>().DeleteAsync(organization);
     }
@@ -212,14 +212,14 @@ public class OrganizationUserControllerAutoConfirmTests : IClassFixture<ApiAppli
             .GetManyByUserIdAsync(organizationUser.UserId!.Value);
         Assert.NotEmpty(collections);
         // validates user only received one default collection
-        Assert.Single(collections.Where(c => c.Type == CollectionType.DefaultUserCollection));
+        Assert.Single(collections, c => c.Type == CollectionType.DefaultUserCollection);
 
         await _factory.GetService<IOrganizationRepository>().DeleteAsync(organization);
     }
 
-    public Task DisposeAsync()
+    public ValueTask DisposeAsync()
     {
         _client.Dispose();
-        return Task.CompletedTask;
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/test/Core.Test/AdminConsole/AutoFixture/OrganizationFixtures.cs b/test/Core.Test/AdminConsole/AutoFixture/OrganizationFixtures.cs
index 5cc1db4d37..0333a9eaaf 100644
--- a/test/Core.Test/AdminConsole/AutoFixture/OrganizationFixtures.cs
+++ b/test/Core.Test/AdminConsole/AutoFixture/OrganizationFixtures.cs
@@ -2,7 +2,7 @@
 using System.Text.Json;
 using AutoFixture;
 using AutoFixture.Kernel;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;