diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 458f5b1f0e..77e707590e 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -357,9 +357,6 @@
 	"This workCenter is already assigned to this agency": "Este centro de trabajo ya está asignado a esta agencia",
 	"Select ticket or client": "Elija un ticket o un client",
 	"It was not able to create the invoice": "No se pudo crear la factura",
-<<<<<<< HEAD
-	"This PDA is already assigned to another user": "This PDA is already assigned to another user"
-=======
+	"This PDA is already assigned to another user": "This PDA is already assigned to another user",
 	"ticketCommercial": "El ticket {{ ticket }} para el vendedor {{ salesMan }} está en preparación. (mensaje generado automáticamente)"
->>>>>>> test
 }
\ No newline at end of file