diff --git a/sapl/base/urls.py b/sapl/base/urls.py
index 19f403c5f..f9c16fc49 100644
--- a/sapl/base/urls.py
+++ b/sapl/base/urls.py
@@ -34,11 +34,8 @@ from .views import (AlterarSenha, AppConfigCrud, CasaLegislativaCrud,
                     ListarParlMandatosIntersecaoView,
                     ListarAutoresDuplicadosView,
                     ListarBancadaComissaoAutorExternoView,
-<<<<<<< HEAD
                     ListarLegislaturaInfindavelView)
-=======
-                    ListarLegislaturaAnteriorInfindavelView)
->>>>>>> Identificar legislatura infindável
+
 
 app_name = AppConfig.name
 
diff --git a/sapl/templates/base/legislatura_anterior_infindavel.html b/sapl/templates/base/legislatura_anterior_infindavel.html
deleted file mode 100644
index 9a35b2668..000000000
--- a/sapl/templates/base/legislatura_anterior_infindavel.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load tz %}
-{% load common_tags %}
-{% block base_content %}
-    <fieldset>
-        <h1>Lista de Legislaturas Anteriores sem Data Fim</h1>
-        {% if not legislatura_anterior_infindavel %}
-            <p>{{ NO_ENTRIES_MSG }}</p>
-        {% else %}
-            <table class="table table-striped table-hover">
-                <thead>
-                  <tr>
-                    <th>Legislatura</th>
-                    <th>Data Fim</th>
-                    <th>Data Eleição</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {% for legislatura in legislatura_anterior_infindavel %}
-                    <tr>
-                        <td>{{ legislatura.numero }}</td>
-                        <td>{{ legislatura.data_eleicao }}</td>
-                        <td>{{ legislatura.data_inicio }}</td>
-                    </tr>
-                  {% endfor %}
-                </tbody>
-            </table>
-        {% endif %}
-    </fieldset>
- {% include 'paginacao.html'%}
-{% endblock base_content %}
\ No newline at end of file