diff --git a/djadmin2/templates/admin2/bootstrap/index.html b/djadmin2/templates/admin2/bootstrap/index.html
index 203746e..1ab2836 100644
--- a/djadmin2/templates/admin2/bootstrap/index.html
+++ b/djadmin2/templates/admin2/bootstrap/index.html
@@ -24,12 +24,8 @@
                             </a>
                         </td>
                         <td class="text-right">
-<<<<<<< HEAD
                         {# if has_add_permission #}
-                            <a href="TODO">
-=======
                             <a href="{% url model_admin|admin2_urlname:'create' %}">
->>>>>>> fix-admin-index-links
                                 <i class="icon-plus"></i>
 
                                 Add
@@ -37,11 +33,7 @@
                         {# endif #}
                         </td>
                         <td class="text-right">
-<<<<<<< HEAD
                             <a href="{{ model_admin.get_index_url }}">
-=======
-                            <a href="{# FIXME: edit kind of doesn't make sense for the whole ModelAdmin #}">
->>>>>>> fix-admin-index-links
                                 <i class="icon-pencil"></i>
                                 Change
                             </a>