diff --git a/themes/hellug-bootstrap/layouts/partials/header.html b/themes/hellug-bootstrap/layouts/partials/header.html
index 7fd9680..94f3803 100644
--- a/themes/hellug-bootstrap/layouts/partials/header.html
+++ b/themes/hellug-bootstrap/layouts/partials/header.html
@@ -56,11 +56,7 @@
 	    </ul>
         <ul class="navbar-nav d-flex flex-row">
             <div class="vr"></div>
-<<<<<<< HEAD
             <a class="nav-link" alt="Είσοδος Μέλους" href="/api/ui/member/">
-=======
-            <a class="nav-link" alt="Είσοδος Μέλους" href="ui/member/">
->>>>>>> 37eff0fb70dc1ee7933d7e39cbf308d23785a4cc
                 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" class="bi bi-person-fill" viewBox="0 0 16 16"><path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6"/><title>Είσοδος Μέλους</title> </svg>
             </a>
         </ul>