diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 9b5bb75c35b..1a2b1f9b43a 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -384,6 +384,7 @@ ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_valid	FOREIGN KEY (f
 
 -- update llx_extrafields
 UPDATE llx_extrafields SET elementtype = 'delivery' WHERE llx_extrafields.elementtype = 'livraison';
+<<<<<<< HEAD
 UPDATE llx_extrafields SET elementtype = 'deliverydet' WHERE llx_extrafields.elementtype = 'livraisondet';
 
 -- update llx_ecm_files
@@ -396,3 +397,6 @@ UPDATE llx_links SET objecttype = 'delivery' WHERE llx_links.objecttype = 'livra
 UPDATE llx_document_model SET type = 'delivery' WHERE llx_document_model.type = 'livraison';
 
 -- TODO Check DB llx_actioncomm, llx_element_element(already modified by shipping/delivery), llx_c_email_template, llx_c_type_contact, llx_object_langs because Module changing label livraison 2 delivery. I think those table have been manage by Module Expedition 
+=======
+UPDATE llx_extrafields SET elementtype = 'deliverydet' WHERE llx_extrafields.elementtype = 'livraisondet';
+>>>>>>> parent of 5fa481422a... update dependencies migration12->13.sql  #14697