diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b1f624b8012..9e948ea2b77 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1705,9 +1705,7 @@
                         <field name="location_id"/>
                         <field name="location_dest_id"/>
                     </group>
-<<<<<<< TREE
-            <field name="name">Delivery Products vs Planned</field>
-=======
+
                     <group colspan="2" col="2">
                         <separator string="Dates &amp; Priority" colspan="2" />
                         <field name="date" groups="base.group_extended"/>