diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py
index 9f94a60da..821f677ee 100644
--- a/sapl/comissoes/models.py
+++ b/sapl/comissoes/models.py
@@ -221,11 +221,19 @@ class Reuniao(models.Model):
     observacao = models.TextField(
         max_length=150, blank=True, verbose_name=_('Observação'))
     url_audio = models.URLField(
+<<<<<<< HEAD
         max_length=150, blank=True,
         verbose_name=_('URL do Arquivo de Áudio (Formatos MP3 / AAC)'))
     url_video = models.URLField(
         max_length=150, blank=True,
         verbose_name=_('URL do Arquivo de Vídeo (Formatos MP4 / FLV / WebM)'))
+=======
+        max_length=150, blank=True, null=True,
+        verbose_name=_('URL Arquivo Áudio (Formatos MP3 / AAC)'))
+    url_video = models.URLField(
+        max_length=150, blank=True, null=True,
+        verbose_name=_('URL Arquivo Vídeo (Formatos MP4 / FLV / WebM)'))
+>>>>>>> Corrige Createview e Listview
     upload_pauta = models.FileField(
         blank=True, null=True,
         upload_to=pauta_upload_path,
diff --git a/sapl/templates/comissoes/reuniao_list.html b/sapl/templates/comissoes/reuniao_list.html
index cdecd459e..2321a9c78 100644
--- a/sapl/templates/comissoes/reuniao_list.html
+++ b/sapl/templates/comissoes/reuniao_list.html
@@ -1,7 +1,7 @@
 {% extends "crud/list.html" %}
 {% load i18n %}
 {% load crispy_forms_tags %}
-{% block base_content %}
+{% block detail_content %}
 
  {% if user.is_authenticated and perms.comissoes.add_composicao %}
   <div class="context-actions clearfix">
@@ -16,6 +16,5 @@
       </div>
     {% endblock actions %}
   </div>
-  {% endif %}
-  
-{% endblock base_content %}
+ {% endif %}
+{% endblock detail_content %}