diff --git a/stock_ux/__manifest__.py b/stock_ux/__manifest__.py
index 2483534c7..1eb7cb2e6 100644
--- a/stock_ux/__manifest__.py
+++ b/stock_ux/__manifest__.py
@@ -19,7 +19,13 @@
 ##############################################################################
 {
     "name": "Stock UX",
+<<<<<<< a840f3e45961f91a06c77aa8b6aab07e736611a4
     "version": "19.0.1.1.0",
+||||||| 189360d65e8138c2b298b712d8ea90369da3ea5a
+    "version": "18.0.1.5.0",
+=======
+    "version": "18.0.1.6.0",
+>>>>>>> e21c25bea1bb373be2e06c548528b68772a339ce
     "category": "Warehouse Management",
     "sequence": 14,
     "summary": "",
diff --git a/stock_ux/report/picking_templates.xml b/stock_ux/report/picking_templates.xml
index d7ba61c5f..81236e899 100644
--- a/stock_ux/report/picking_templates.xml
+++ b/stock_ux/report/picking_templates.xml
@@ -12,15 +12,15 @@
 ^LH0,0
 ^FO20,10,0
 
-^FO260,10
+^FO250,10
 ^A0N,20,25^FD<t t-esc="o.move_id.picking_id.date_done" t-options="{'widget': 'date'}"/>^FS
 
-^FO20,40
+^FO10,40
 ^A0N,40,30
 ^TBN,360,40
 ^FD<t t-esc="o.move_id.product_id.display_name"/>^FS
 
-^FO20,90
+^FO10,90
 ^BY3
 ^BCN,60,Y,N,N,A
 ^FD<t t-esc="o.move_id.product_id.barcode"/>^FS
@@ -29,13 +29,13 @@
 ^FX Nueva etiqueta
 ^LH445,0
 ^FO20,10,0
-^FO260,10
+^FO250,10
 ^A0N,20,25^FD<t t-esc="o.move_id.picking_id.date_done" t-options="{'widget': 'date'}"/>^FS
-^FO20,40
+^FO10,40
 ^A0N,40,30
 ^TBN,360,40
 ^FD<t t-esc="o.move_id.product_id.display_name"/>^FS
-^FO20,90
+^FO10,90
 ^BY3
 ^BCN,60,Y,N,N,A
 ^FD<t t-esc="o.move_id.product_id.barcode"/>^FS