diff --git a/sigi/apps/convenios/admin.py b/sigi/apps/convenios/admin.py
index 6b8cab3..5800869 100644
--- a/sigi/apps/convenios/admin.py
+++ b/sigi/apps/convenios/admin.py
@@ -10,11 +10,8 @@ from sigi.apps.utils import queryset_ascii
 from sigi.apps.servidores.models import Servidor
 from sigi.apps.casas.admin import ConveniosInline, GerentesInterlegisFilter
 from sigi.apps.utils.mixins import CartExportReportMixin, LabeledResourse
-<<<<<<< HEAD
 from django_weasyprint.views import WeasyTemplateResponse
-=======
 from sigi.apps.utils.filters import DateRangeFilter
->>>>>>> 96ea3b8f2dd4c7380c7e59f4a0546e6c27b09ffe
 
 class ConvenioExportResourse(LabeledResourse):
     class Meta:
diff --git a/templates/admin/change_list.html b/templates/admin/change_list.html
index f1a7f8a..b6a2e4c 100644
--- a/templates/admin/change_list.html
+++ b/templates/admin/change_list.html
@@ -1,6 +1,35 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_urls admin_static admin_list bootstrapped_goodies_tags %}
 
+
+{% block object-tools %}
+        <ul class="object-tools pull-left nav nav-pills">
+            {% block object-tools-items %}
+            {% if has_add_permission %}
+            <li>
+            {% url cl.opts|admin_urlname:'add' as add_url %}
+            <a href="{% add_preserved_filters add_url is_popup %}">
+                <span class="glyphicon glyphicon-plus"></span> {% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}
+            </a>
+            </li>
+            {% endif %}
+            {% endblock %}
+        </ul>
+        {% if cl.has_filters %}
+        <ul class="nav navbar-nav pull-right">
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans 'Filter' %} <span class="caret"></span></a>
+                <ul class="dropdown-menu pull-right">
+                    {% for spec in cl.filter_specs %}
+                        {% admin_list_filter cl spec %}
+                    {% endfor %}
+                </ul>
+            </li>
+        </ul>
+        {% endif %}
+        {% block search %}{% search_form cl %}{% endblock %}
+    {% endblock %}
+
 {% block extrastyle %}
   {{ block.super }}
   <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
@@ -31,91 +60,3 @@
 {% block bodyclass %}_change-list{% endblock %}
 
 {% block coltype %}flex{% endblock %}
-
-{% block object-tools %}
-    <ul class="object-tools pull-left nav nav-pills">
-        {% block object-tools-items %}
-        {% if has_add_permission %}
-        <li>
-        {% url cl.opts|admin_urlname:'add' as add_url %}
-        <a href="{% add_preserved_filters add_url is_popup %}">
-            <span class="glyphicon glyphicon-plus"></span> {% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}
-        </a>
-        </li>
-        {% endif %}
-        {% endblock %}
-    </ul>
-    {% if cl.has_filters %}
-    <ul class="nav navbar-nav pull-right">
-        <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans 'Filter' %} <span class="caret"></span></a>
-            <ul class="dropdown-menu pull-right">
-                {% for spec in cl.filter_specs %}
-                    {% admin_list_filter cl spec %}
-                {% endfor %}
-            </ul>
-        </li>
-    </ul>
-    {% endif %}
-    {% block search %}{% search_form cl %}{% endblock %}
-{% endblock %}
-
-{% block content %}
-{% block extra_search %}{% endblock %}
-<form class="" id="changelist-form" action="" method="post"{% if cl.formset.is_multipart %} enctype="multipart/form-data"{% endif %}>{% csrf_token %}
-
-{% if cl.formset.errors %}
-<div class="alert alert-danger">
-    <p class="errornote">
-        {% blocktrans count cl.formset.errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
-    </p>
-    {{ cl.formset.non_form_errors }}
-</div>
-{% endif %}
-
-
-{% with app_name=cl.opts.module_name|lower|slugify %}
-    {% render_with_template_if_exist cl.opts.app_label|lower|add:"/admin_app_"|add:app_name|add:"_description.html" "" %}
-{% endwith %}
-
-{% if action_form and actions_on_top and cl.full_result_count %}
-<div class='pull-left'>{% admin_actions %}</div>
-{% endif %}
-
-<div id="content-main">
-    <div class="module{% if cl.has_filters %} filtered{% endif %}" id="_changelist">
-        {% block date_hierarchy %}
-            {% date_hierarchy cl %}
-        {% endblock %}
-
-        {% if cl.formset %}
-            <div>{{ cl.formset.management_form }}</div>
-        {% endif %}
-
-        {% block result_list %}
-            {% result_list cl %}
-        {% endblock %}
-    </div>
-</div>
-{# {% if cl.formset and cl.result_count %} #}
-<div class="navbar navbar-default">
-    <div class="navbar-inner">
-        <div class="navbar-form pull-left">
-            {% if action_form and actions_on_bottom and cl.full_result_count %}
-                {% admin_actions %}
-            {% endif %}
-        </div>
-        <div class="navbar-form pull-right">
-            <input type="submit" name="_save" class="btn btn-primary default" value="{% trans 'Save' %}"/>
-        </div>
-    </div>
-</div>
-{# {% endif %} #}
-
-{% block pagination %}
-    {% pagination cl %}
-{% endblock %}
-</form>
-{% endblock %}
-
-