Resolve merge conflicts2

Author: DashProsh

.gradle/8.10/executionHistory/executionHistory.bin

@@ -34,7 +34,7 @@ public static Map<String, Object> parseFromResources(String fileName) throws IOE
             throw new RuntimeException("Invalid file path: " + fileName, e);
         }
 
-        return objectMapper.readValue(path.toFile(), new TypeReference<Map<String, Object>>() {});
+        return objectMapper.readValue(path.toFile(), new TypeReference<Map<String, Object>>() { });
     }
 
     // Используется из CLI — напрямую с файловой системы
@@ -49,7 +49,7 @@ public static Map<String, Object> parse(String filePath) throws IOException {
             throw new IllegalArgumentException("Unsupported file format: " + filePath);
         }
 
-        return objectMapper.readValue(new File(filePath), new TypeReference<Map<String, Object>>() {});
+        return objectMapper.readValue(new File(filePath), new TypeReference<Map<String, Object>>() { });
     }
 }