diff --git a/controllers/main.py b/controllers/main.py
index a97ec69bee23dee3fb7f285fda5e3599233a8061..62e3d643c55238f00cd04a22b031014b54910e59 100644
--- a/controllers/main.py
+++ b/controllers/main.py
@@ -48,13 +48,8 @@ class JournalDatasExport(http.Controller):
         for line in export_line_ids:
             row = []
             for field in export_id.fields_ids:
-<<<<<<< HEAD
-                if field["field_name"].startswith("line."):
-                    value = safe_eval(field["field_name"], {"line": line}, mode="eval")
-=======
                 if field.is_python:
-                    value = safe_eval(field["field_name"], {'line': line}, mode="eval")
->>>>>>> ebb23a7 ([add] is_python on export.journal.field)
+                    value = safe_eval(field["field_name"], {"line": line}, mode="eval")
                 else:
                     value = safe_eval(field["field_name"])
                 row.append(value)