diff --git a/addons/report_document/report_document_view.xml b/addons/report_document/report_document_view.xml
index e739a3fe629..b4b5eaca1d5 100644
--- a/addons/report_document/report_document_view.xml
+++ b/addons/report_document/report_document_view.xml
@@ -2,7 +2,6 @@
 <openerp>
  <data>
 
-<<<<<<< TREE
     <record model="ir.ui.view" id="view_document_user_form">
             <field name="name">report.document.user.form</field>
             <field name="model">report.document.user</field>