diff --git a/intrastat_product_generic/views/intrastat_product.xml b/intrastat_product_generic/views/intrastat_product.xml
index 631a261..11f0e55 100644
--- a/intrastat_product_generic/views/intrastat_product.xml
+++ b/intrastat_product_generic/views/intrastat_product.xml
@@ -5,7 +5,11 @@
     <field name="name">Generic Intrastat Product Declaration</field>
     <field name="res_model">intrastat.product.declaration</field>
     <field name="view_mode">tree,form,graph</field>
+<<<<<<< HEAD
     <field name="context">{'generic_intrastat_product_declaration': 1}</field>
+=======
+    <field name="context">{'generic_intrastat_product_declaration': 1}</field>  
+>>>>>>> 6348dd7f6b322e867299fc0600309e5664be244b
   </record>
 
   <menuitem id="intrastat_product_declaration_menu_generic"