diff --git a/cor_custom/views/analytic_view.xml b/cor_custom/views/analytic_view.xml
index 98a8514..acdac25 100755
--- a/cor_custom/views/analytic_view.xml
+++ b/cor_custom/views/analytic_view.xml
@@ -179,8 +179,6 @@
         </field>
     </record>
 
-<<<<<<< HEAD
-=======
     <record id="timesheet_view_inherit1_search" model="ir.ui.view">
         <field name="name">account.analytic.line.search</field>
         <field name="model">account.analytic.line</field>