diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html
index 2b47507c..d62dbbaa 100644
--- a/fet2020/templates/layout.html
+++ b/fet2020/templates/layout.html
@@ -55,16 +55,10 @@
                     {% endif %}
                     </a>
                 </li>          
-<<<<<<< HEAD
-                <li><a href="/admin" style="background: lightgrey;">Admin</a></li>
-                <li><a href="{% url 'tasks' %}" style="background: lightgrey;">Tasks</a></li>
-                <li><a href="{% url 'intern' %}" style="background: lightgrey;">Intern</a></li>
-                <li><a href="https://legacy.fet.at/home/intern" style="background: lightgrey;">Legacy Intern</a></li>
-=======
                 <li><a class="button header-intern-btn header-intern-link" href="/admin">Admin</a></li>
                 <li><a class="button header-intern-btn header-intern-link" href="{% url 'tasks' %}">Tasks</a></li>
-                <li><a class="button header-intern-btn header-intern-link" href="https://legacy.fet.at/home/intern">Intern</a></li>
->>>>>>> origin/master
+                <li><a class="button header-intern-btn header-intern-link" href="{% url 'intern' %}">Intern</a></li>
+                <li><a class="button header-intern-btn header-intern-link" href="https://legacy.fet.at/home/intern">Legacy Intern</a></li>
             {% endif %}
             <li><a class="button header-btn header-link" href="{% url 'posts.index' %}">News</a></li>
             <!-- show active members first -->