diff --git a/reports/__manifest__.py b/reports/__manifest__.py
index f7a3cc2..8b3cdf3 100644
--- a/reports/__manifest__.py
+++ b/reports/__manifest__.py
@@ -10,11 +10,7 @@
     'maintainer': '',
     'website': "",
     'depends': [
-<<<<<<< Updated upstream
-        'base','account', 'bi_professional_reports_templates'
-=======
         'base','report', 'account', 'bi_professional_reports_templates'
->>>>>>> Stashed changes
     ],
     'data': [
         'views/invoice_report.xml',