diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 1dbb394ab..819ee1740 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -330,10 +330,6 @@
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
 	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
 	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
-<<<<<<< HEAD
-	"The line could not be marked": "The line could not be marked"
-}
-=======
+	"The line could not be marked": "The line could not be marked",
     "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada"
 }
->>>>>>> 0101dcda3ac950c1add6c3c426c4f745389805c1