diff --git a/argos/server/templates/index.html b/argos/server/templates/index.html
index 39de729..9a31d76 100644
--- a/argos/server/templates/index.html
+++ b/argos/server/templates/index.html
@@ -2,7 +2,6 @@
 {% block title %}<h2>Dashboard</h2>{% endblock title %}
 {% block content %}
     <div id="domains" class="frame">
-<<<<<<< HEAD
         <nav>
             <ul>
                 <li>