diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 79ae853e0..932dfe98f 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -237,12 +237,6 @@
 	"Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
 	"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
 	"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
-<<<<<<< HEAD
-	"You don't have grant privilege": "No tienes privilegios para dar privilegios",
-	"You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
-	"this warehouse has not dms": "this warehouse has not dms"
-}
-=======
 	"This route does not exists": "Esta ruta no existe",
 	"Claim pickup order sent": "Reclamación Orden de recogida enviada [({{claimId}})]({{{claimUrl}}}) al cliente *{{clientName}}*",
 	"You don't have grant privilege": "No tienes privilegios para dar privilegios",
@@ -257,4 +251,3 @@
     "This receipt was not compensated": "Este recibo no ha sido compensado",
     "Client's email was not found": "No se encontró el email del cliente"
 }
->>>>>>> dev