diff --git a/src/lib/components/util/ArticleNav.svelte b/src/lib/components/util/ArticleNav.svelte
index 06dc4c0..f2c986c 100644
--- a/src/lib/components/util/ArticleNav.svelte
+++ b/src/lib/components/util/ArticleNav.svelte
@@ -162,7 +162,6 @@
         {/if}
       {/if}
     </div>
-<<<<<<< HEAD
     <div class="flex flex-col flex-grow text justify-center items-center">
       <p class="max-w-[60vw] line-ellipsis">
         <b class="text-nowrap">{title}</b>