diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor
index aec5beea7e..fb1ca464d1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor
@@ -1,13 +1,7 @@
-<<<<<<< HEAD:src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/NavMenu.razor
-<div class="top-row pl-4 navbar navbar-dark">
-    <a class="navbar-brand" href="">RazorComponentsWeb-CSharp</a>
-    <button class="navbar-toggler" @onclick="ToggleNavMenu">
-=======
 <div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="">BlazorServerWeb-CSharp</a>
     <button class="navbar-toggler" @onclick="@ToggleNavMenu">
->>>>>>> Rename RazorComponents template directory to BlazorServer:src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Shared/NavMenu.razor
-        <span class="navbar-toggler-icon"></span>
+       <span class="navbar-toggler-icon"></span>
     </button>
 </div>