diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 84459f42fd9..6c2f4af3ad3 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -86,7 +86,6 @@ class report_event_registration(osv.osv):
                 e.seats_max,
                 e.main_speaker_id,
                 e.register_max,
->>>>>>> MERGE-SOURCE
                 name_registration
         )
         """)