diff --git a/bemade_fsm/__manifest__.py b/bemade_fsm/__manifest__.py
index 45c1893..cb73ae3 100644
--- a/bemade_fsm/__manifest__.py
+++ b/bemade_fsm/__manifest__.py
@@ -52,13 +52,8 @@
         'views/menus.xml',
         'views/task_views.xml',
         'views/sale_order_views.xml',
-<<<<<<< HEAD
         'reports/worksheet_custom_report_templates.xml',
         'reports/worksheet_custom_reports.xml',
-=======
-        # 'reports/worksheet_custom_report_templates.xml',
-        # 'reports/worksheet_custom_reports.xml',
->>>>>>> 5a006ec3
         'wizard/new_task_from_template.xml',
     ],
     'assets': {