fixed templateUrl, merge fix

apps/desktop/src/vault/app/vault-v3/vault-orig.component.ts

@@ -100,7 +100,7 @@ const BroadcasterSubscriptionId = "VaultComponent";
 // eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-v3",
-  templateUrl: "vault.component.html",
+  templateUrl: "vault-orig.component.html",
   imports: [
     BadgeModule,
     CommonModule,

apps/desktop/src/vault/app/vault-v3/vault.component.ts

@@ -12,7 +12,6 @@ import {
 } from "@angular/core";
 import { ActivatedRoute, Router, Params } from "@angular/router";
 import {
-  combineLatest,
   firstValueFrom,
   Subject,
   takeUntil,
@@ -86,7 +85,6 @@ import {
   CipherFormModule,
   CipherViewComponent,
   CollectionAssignmentResult,
-  createFilterFunction,
   DecryptionFailureDialogComponent,
   DefaultChangeLoginPasswordService,
   DefaultCipherFormConfigService,
@@ -98,6 +96,7 @@ import {
   RoutedVaultFilterBridgeService,
   RoutedVaultFilterService,
   RoutedVaultFilterModel,
+  createFilterFunction,
   All,
   VaultItem,
   VaultItemEvent,