diff --git a/mariadb/aria_log.00000001 b/mariadb/aria_log.00000001
index 4506023..751919a 100644
Binary files a/mariadb/aria_log.00000001 and b/mariadb/aria_log.00000001 differ
diff --git a/mariadb/aria_log_control b/mariadb/aria_log_control
index 6581d65..6cdd68f 100644
Binary files a/mariadb/aria_log_control and b/mariadb/aria_log_control differ
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
index 38c7a48..bac9631 100644
--- a/src/auth/auth.service.ts
+++ b/src/auth/auth.service.ts
@@ -24,12 +24,8 @@ export class AuthService {
     }
 
     try {
-<<<<<<< HEAD
       const salt = await bcrypt.genSalt(10);
       const hashedContraseña = await bcrypt.hash(contraseña, salt);
-=======
-      const hashedContraseña = await bcrypt.hash(contraseña,10);
->>>>>>> 3317b7bdbe91d04618f00c28caeca76c35803f9c
 
       await this.usuarioService.create({
         nombre,
@@ -52,10 +48,6 @@ export class AuthService {
     }
 
     const contraseñaValida = await bcrypt.compare(
-<<<<<<< HEAD
-=======
-      usuario.contraseña,
->>>>>>> 3317b7bdbe91d04618f00c28caeca76c35803f9c
       contraseña,
       usuario.contraseña,
     );