diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthorizedHeader.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthorizedHeader.razor.cs
index fae9bc53ac..ef536db76d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthorizedHeader.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthorizedHeader.razor.cs
@@ -1,10 +1,6 @@
 namespace Boilerplate.Client.Core.Components.Layout;
 
-<<<<<<<< HEAD:src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthenticatedHeader.razor.cs
-public partial class AuthenticatedHeader : AppComponentBase
-========
 public partial class AuthorizedHeader : AppComponentBase
->>>>>>>> 196d1ef14557dc3d723cd6ce6f8c73456bfd7ec4:src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthorizedHeader.razor.cs
 {
     private string? pageTitle;
     private string? pageSubtitle;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.cs
index 3f5639a9a5..3b9b370dc1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.cs
@@ -1,6 +1,6 @@
 namespace Boilerplate.Client.Core.Components.Layout;
 
-public partial class UnauthenticatedHeader : AppComponentBase, IDisposable
+public partial class IdentityHeader : AppComponentBase, IDisposable
 {
     private string? backLinkPayload;
     private BitDropdownItem<string>[] cultures = default!;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss
index a3bd55ba1e..d395412f82 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss
@@ -6,10 +6,6 @@ header {
     height: 65px;
     padding: 1rem;
     position: absolute;
-<<<<<<<< HEAD:src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UnauthenticatedHeader.razor.scss
-    height: 65px;
-========
->>>>>>>> 196d1ef14557dc3d723cd6ce6f8c73456bfd7ec4:src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/IdentityHeader.razor.scss
     z-index: $bit-zindex-base;
 }
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RouteDataPublisher.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RouteDataPublisher.cs
deleted file mode 100644
index 70fd7be239..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RouteDataPublisher.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-
-namespace Boilerplate.Client.Core.Components.Layout;
-
-public partial class RouteDataPublisher : AppComponentBase
-{
-    [Parameter] public RouteData? RouteData { get; set; }
-
-    protected override Task OnInitAsync()
-    {
-        PubSubService.Publish(PubSubMessages.ROUTE_DATA_UPDATED, RouteData);
-
-        return base.OnInitAsync();
-    }
-}