diff --git a/frappe/translate.py b/frappe/translate.py
index f5f9797d07..624d69a244 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -444,10 +444,14 @@ def get_messages_from_report(name):
 		frappe.db.get_value("DocType", report.ref_doctype, "module"))
 
 	if report.columns:
+<<<<<<< HEAD
 		messages.extend([(None, report_column.label) for report_column in report.columns])
 
 	if report.filters:
 		messages.extend([(None, report_filter.label) for report_filter in report.filters])
+=======
+		messages.extend([(None, column.label) for column in report.columns])
+>>>>>>> f84aee8abe... fix: translate report column labels
 
 	if report.query:
 		messages.extend([(None, message) for message in re.findall('"([^:,^"]*):', report.query) if is_translatable(message)])