diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor
index 55b9b26..6893089 100644
--- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor
+++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor
@@ -1,22 +1,18 @@
-@inherits LayoutComponentBase
-
-<PageTitle>WF-WebAdmin</PageTitle>
-
-<div class="page">
-    <div class="sidebar_app">
-        <NavMenu />
-    </div>
-
-    <main>
-<<<<<<< HEAD
-        <div class="top-row-app px-4">
-            <a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
-        </div>
-
-=======
->>>>>>> a5f669a3101747ffe3b2b969d580060ac8954bad
-        <article class="content px-4">
-            @Body
-        </article>
-    </main>
-</div>
+@inherits LayoutComponentBase
+
+<PageTitle>WF-WebAdmin</PageTitle>
+
+<div class="page">
+    <div class="sidebar_app">
+        <NavMenu />
+    </div>
+
+    <main>
+        <div class="top-row-app px-4">
+            <a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
+        </div>
+        <article class="content px-4">
+            @Body
+        </article>
+    </main>
+</div>