From 452df4b07939d8faab1f507c04194caaea64bacd Mon Sep 17 00:00:00 2001
From: Jimmy Vo <huynhmaivo82@gmail.com>
Date: Mon, 21 Apr 2025 11:13:09 -0400
Subject: [PATCH] =?UTF-8?q?[PM-19814]=20Fix=20merge=20conflict=20and=20upd?=
 =?UTF-8?q?ate=20text=20based=20on=20product=20owner=E2=80=99s=20request?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/phishing-detection/pages/phishing-warning.html        | 4 ++--
 apps/browser/src/popup/app-routing.module.ts                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/browser/src/phishing-detection/pages/phishing-warning.html b/apps/browser/src/phishing-detection/pages/phishing-warning.html
index fe547a72431..9d2f621ec4e 100644
--- a/apps/browser/src/phishing-detection/pages/phishing-warning.html
+++ b/apps/browser/src/phishing-detection/pages/phishing-warning.html
@@ -1,8 +1,8 @@
 <div [formGroup]="formGroup">
   <bit-form-field>
-    <bit-label>Phishing url</bit-label>
+    <bit-label>Phishing website</bit-label>
     <input bitInput type="text" formControlName="phishingHost" />
   </bit-form-field>
 
-  <a (click)="closeTab()" bitButton block buttonType="primary"> Exit page </a>
+  <a (click)="closeTab()" bitButton block buttonType="primary">Close tab</a>
 </div>
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 8007d64e4fa..f2e9af72ffd 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -55,7 +55,6 @@ import {
   ExtensionAnonLayoutWrapperComponent,
   ExtensionAnonLayoutWrapperData,
 } from "../auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component";
-import { RemovePasswordComponent } from "../auth/popup/remove-password.component";
 import { SetPasswordComponent } from "../auth/popup/set-password.component";
 import { AccountSecurityComponent } from "../auth/popup/settings/account-security.component";
 import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component";
@@ -65,6 +64,7 @@ import { BlockedDomainsComponent } from "../autofill/popup/settings/blocked-doma
 import { ExcludedDomainsComponent } from "../autofill/popup/settings/excluded-domains.component";
 import { NotificationsSettingsComponent } from "../autofill/popup/settings/notifications.component";
 import { PremiumV2Component } from "../billing/popup/settings/premium-v2.component";
+import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
 import { PhishingLandingIcon } from "../phishing-detection/images/phishing-landing-icon";
 import { LearnMoreComponent } from "../phishing-detection/pages/learn-more-component";
 import { PhishingWarning } from "../phishing-detection/pages/phishing-warning";