fix bad merge resolution

src/Core/Constants.cs

@@ -195,9 +195,6 @@ public static class FeatureFlagKeys
     /* Vault Team */
     public const string PM8851_BrowserOnboardingNudge = "pm-8851-browser-onboarding-nudge";
     public const string PM9111ExtensionPersistAddEditForm = "pm-9111-extension-persist-add-edit-form";
-    public const string VaultBulkManagementAction = "vault-bulk-management-action";
-    public const string NewDeviceVerificationPermanentDismiss = "new-device-permanent-dismiss";
-    public const string NewDeviceVerificationTemporaryDismiss = "new-device-temporary-dismiss";
     public const string RestrictProviderAccess = "restrict-provider-access";
     public const string SecurityTasks = "security-tasks";
     public const string CipherKeyEncryption = "cipher-key-encryption";

util/DbSeederUtility/GlobalSettingsFactory.cs

@@ -1,4 +1,7 @@
-namespace Bit.DbSeederUtility;
+using Bit.Core.Settings;
+using Microsoft.Extensions.Configuration;
+
+namespace Bit.DbSeederUtility;
 
 public static class GlobalSettingsFactory
 {

util/DbSeederUtility/Program.cs

@@ -1,4 +1,7 @@
-using Bit.Seeder.Recipes;
+using Bit.Infrastructure.EntityFramework.Repositories;
+using Bit.Seeder.Recipes;
+using CommandDotNet;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Bit.DbSeederUtility;
 

util/DbSeederUtility/ServiceCollectionExtension.cs

@@ -1,4 +1,9 @@
-namespace Bit.DbSeederUtility;
+using Bit.SharedWeb.Utilities;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Bit.DbSeederUtility;
 
 public static class ServiceCollectionExtension
 {

util/Seeder/Recipes/OrganizationWithUsersRecipe.cs

@@ -1,6 +1,7 @@
 using Bit.Infrastructure.EntityFramework.Models;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Bit.Seeder.Factories;
+using LinqToDB.EntityFrameworkCore;
 
 namespace Bit.Seeder.Recipes;