diff --git a/.gitignore b/.gitignore
index 57b491858..8132994dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,6 +89,11 @@ bower
 bower_components
 media
 
+<<<<<<< HEAD
 # Merge garbage
 .orig
 
+=======
+#merge garbage
+.orig
+>>>>>>> Arruma quebra em pesquisa por Relatoria
diff --git a/materia/forms.py b/materia/forms.py
index 6f4966ee4..4bfb9fa06 100644
--- a/materia/forms.py
+++ b/materia/forms.py
@@ -652,7 +652,7 @@ class MateriaLegislativaPesquisaFields(FilterSet):
         empty_label='Selecione',
         help_text="")
 
-    relatoria__parlamentar__id = django_filters.ModelChoiceFilter(
+    relatoria__parlamentar_id = django_filters.ModelChoiceFilter(
         label='Relator',
         required=False,
         queryset=Parlamentar.objects.all().order_by('nome_parlamentar'),