diff --git a/sapl/painel/urls.py b/sapl/painel/urls.py
index fa54a96d4..b734f6813 100644
--- a/sapl/painel/urls.py
+++ b/sapl/painel/urls.py
@@ -3,16 +3,8 @@ from django.conf.urls import url, include
 from .apps import AppConfig
 from .views import (cronometro_painel, get_dados_painel, painel_mensagem_view,
                     painel_parlamentar_view, painel_view, painel_votacao_view,
-<<<<<<< HEAD
                     switch_painel, verifica_painel, votante_view, CronometroPainelCrud,
-<<<<<<< HEAD
                     PainelConfigCrud)
-=======
-                    TipoCronometroCrud)
->>>>>>> Fix #2828 - Adiciona tipo de cronômetro
-=======
-                    switch_painel, verifica_painel, votante_view, CronometroPainelCrud)
->>>>>>> Corrige migrações
 
 app_name = AppConfig.name