diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index afea4e75d42..3ff409d5034 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -55,12 +55,9 @@ Note that if you want to check the follow-up level for a given partner/account e
'account_followup_view.xml',
'account_followup_customers.xml',
'wizard/account_followup_print_view.xml',
-<<<<<<< TREE
'res_config_view.xml'
-=======
'views/report_followup.xml',
'account_followup_reports.xml'
->>>>>>> MERGE-SOURCE
],
'demo': ['account_followup_demo.xml'],
'test': [
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 87b79baa445..675edd1d52c 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -136,12 +136,10 @@
-<<<<<<< TREE
+
-=======
->>>>>>> MERGE-SOURCE
account.move.line.partner.tree