diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/MergeController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
index 806dfdc38..50fc6e0c2 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
@@ -229,7 +229,7 @@ public class MergeController {
             if (!invalidIndexes.isEmpty()) {
                 // Parse client file IDs (always present from frontend)
                 String[] clientIds = parseClientFileIds(request.getClientFileIds());
-                
+
                 // Map invalid indexes to client IDs
                 List<String> errorFileIds = new ArrayList<>();
                 for (Integer index : invalidIndexes) {
@@ -237,12 +237,12 @@ public class MergeController {
                         errorFileIds.add(clientIds[index]);
                     }
                 }
-                
-                String payload = String.format(
-                    "{\"errorFileIds\":%s,\"message\":\"Some of the selected files can't be merged\"}",
-                    errorFileIds.toString()
-                );
-                
+
+                String payload =
+                        String.format(
+                                "{\"errorFileIds\":%s,\"message\":\"Some of the selected files can't be merged\"}",
+                                errorFileIds.toString());
+
                 return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
                         .header("Content-Type", MediaType.APPLICATION_JSON_VALUE)
                         .body(payload.getBytes(StandardCharsets.UTF_8));
diff --git a/frontend/src/services/zipFileService.ts b/frontend/src/services/zipFileService.ts
index 33c817f70..daca80e51 100644
--- a/frontend/src/services/zipFileService.ts
+++ b/frontend/src/services/zipFileService.ts
@@ -360,7 +360,7 @@ export class ZipFileService {
       const zipContents = await zip.loadAsync(file);
 
       // Get all files (not directories)
-      const allFiles = Object.entries(zipContents.files).filter(([filename, zipEntry]) =>
+      const allFiles = Object.entries(zipContents.files).filter(([, zipEntry]) =>
         !zipEntry.dir
       );