diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index c073139..502e6e8 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -15,23 +15,11 @@
         },
         {
             name: "portfolio",
-<<<<<<< HEAD
             subPages: ["learnings", "project a", "project b", "project c"],
-=======
-<<<<<<< HEAD
-            subPages: ["project_a", "project_b", "project_c"],
         },
         {
             name: "contact",
             subPages: ["get_in_touch", "socials"],
-=======
-            subPages: ["project a", "project, b", "project c"],
->>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1
-        },
-        {
-            name: "contact",
-            subPages: ["get in touch", "socials"],
->>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
         },
         {
             name: "login",
@@ -47,10 +35,6 @@
         selected = nav[event.srcElement.id];
         intSelected = event.srcElement.id;
     }
-<<<<<<< HEAD
-
-=======
->>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
 </script>
 
 <nav class="nav-container h-32 w-full">
@@ -69,23 +53,11 @@
     {#key selected}
         <ul in:blur={{ delay: 250 }} out:blur={{ duration: 250 }} class="text-center h-4 my-1">
             {#each selected.subPages as subPage}
-<<<<<<< HEAD
                 <li class="sub-nav-item inline-block  font-jose"><a class="sub-nav-link text-xl p-2"href={(subPage)}>{subPage.replace(/_/g, ' ')}</a></li>   
-=======
-                <li class="sub-nav-item inline-block  font-jose"><a class="sub-nav-link text-xl p-2"href={subPage}>{subPage}</a></li>   
->>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
             {/each}
         </ul>
     {/key}
 </nav>
-<<<<<<< HEAD
 <div class="text-center max-w-xl mx-auto">
-=======
-<<<<<<< HEAD
-<div class="text-center max-w-lg mx-auto">
-=======
-<div class="text-center w-3/5 mx-auto">
->>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
->>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1
     <slot />
 </div>
\ No newline at end of file