diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cb587b56..809cca52 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -126,8 +126,8 @@ catalogs:
       specifier: 2.1.0
       version: 2.1.0
     eslint-config-prettier:
-      specifier: 10.1.5
-      version: 10.1.5
+      specifier: 10.1.8
+      version: 10.1.8
     eslint-flat-config-utils:
       specifier: 2.0.1
       version: 2.0.1
@@ -255,13 +255,7 @@ importers:
         version: 1.0.3
       '@shopify/eslint-plugin':
         specifier: catalog:prod
-<<<<<<< HEAD
-        version: 48.0.2(@typescript-eslint/eslint-plugin@8.34.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(prettier@3.5.3)(typescript@5.8.3)
-||||||| fa90352
-        version: 48.0.2(@typescript-eslint/eslint-plugin@8.34.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(prettier@3.5.3)(typescript@5.8.3)
-=======
-        version: 48.0.2(@typescript-eslint/eslint-plugin@8.34.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(prettier@3.6.2)(typescript@5.8.3)
->>>>>>> origin/main
+        version: 48.0.2(@typescript-eslint/eslint-plugin@8.34.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(prettier@3.6.2)(typescript@5.8.3)
       '@stylistic/eslint-plugin':
         specifier: catalog:prod
         version: 6.0.0-beta.1(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3)
@@ -279,7 +273,7 @@ importers:
         version: 2.1.0(eslint@9.32.0(jiti@2.5.1))
       eslint-config-prettier:
         specifier: catalog:prod
-        version: 10.1.5(eslint@9.32.0(jiti@2.5.1))
+        version: 10.1.8(eslint@9.32.0(jiti@2.5.1))
       eslint-flat-config-utils:
         specifier: catalog:prod
         version: 2.0.1
@@ -421,13 +415,7 @@ importers:
         version: 12.1.1(eslint@9.32.0(jiti@2.5.1))
       eslint-typegen:
         specifier: catalog:dev
-<<<<<<< HEAD
-        version: 2.1.0(eslint@9.32.0(jiti@2.5.1))
-||||||| fa90352
-        version: 2.1.0(eslint@9.32.0(jiti@2.4.2))
-=======
-        version: 2.3.0(eslint@9.32.0(jiti@2.4.2))
->>>>>>> origin/main
+        version: 2.3.0(eslint@9.32.0(jiti@2.5.1))
       esno:
         specifier: catalog:dev
         version: 4.8.0
@@ -2116,8 +2104,8 @@ packages:
     peerDependencies:
       eslint: ^9.5.0
 
-  eslint-config-prettier@10.1.5:
-    resolution: {integrity: sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==}
+  eslint-config-prettier@10.1.8:
+    resolution: {integrity: sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
@@ -4962,18 +4950,11 @@ snapshots:
 
   '@sec-ant/readable-stream@0.4.1': {}
 
-<<<<<<< HEAD
-  '@shopify/eslint-plugin@48.0.2(@typescript-eslint/eslint-plugin@8.34.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(prettier@3.5.3)(typescript@5.8.3)':
-||||||| fa90352
-  '@shopify/eslint-plugin@48.0.2(@typescript-eslint/eslint-plugin@8.34.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(prettier@3.5.3)(typescript@5.8.3)':
-=======
-  '@shopify/eslint-plugin@48.0.2(@typescript-eslint/eslint-plugin@8.34.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(prettier@3.6.2)(typescript@5.8.3)':
->>>>>>> origin/main
+  '@shopify/eslint-plugin@48.0.2(@typescript-eslint/eslint-plugin@8.34.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(prettier@3.6.2)(typescript@5.8.3)':
     dependencies:
       change-case: 4.1.2
       common-tags: 1.8.2
       doctrine: 2.1.0
-<<<<<<< HEAD
       eslint: 9.32.0(jiti@2.5.1)
       eslint-config-prettier: 9.1.2(eslint@9.32.0(jiti@2.5.1))
       eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint@9.32.0(jiti@2.5.1))
@@ -4983,42 +4964,11 @@ snapshots:
       eslint-plugin-jest-formatting: 3.1.0(eslint@9.32.0(jiti@2.5.1))
       eslint-plugin-jsx-a11y: 6.10.2(eslint@9.32.0(jiti@2.5.1))
       eslint-plugin-n: 17.21.3(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3)
-      eslint-plugin-prettier: 5.5.3(eslint-config-prettier@9.1.2(eslint@9.32.0(jiti@2.5.1)))(eslint@9.32.0(jiti@2.5.1))(prettier@3.5.3)
+      eslint-plugin-prettier: 5.5.3(eslint-config-prettier@9.1.2(eslint@9.32.0(jiti@2.5.1)))(eslint@9.32.0(jiti@2.5.1))(prettier@3.6.2)
       eslint-plugin-promise: 7.2.1(eslint@9.32.0(jiti@2.5.1))
       eslint-plugin-react: 7.37.5(eslint@9.32.0(jiti@2.5.1))
       eslint-plugin-react-hooks: 5.2.0(eslint@9.32.0(jiti@2.5.1))
       eslint-plugin-sort-class-members: 1.21.0(eslint@9.32.0(jiti@2.5.1))
-||||||| fa90352
-      eslint: 9.32.0(jiti@2.4.2)
-      eslint-config-prettier: 9.1.2(eslint@9.32.0(jiti@2.4.2))
-      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-eslint-comments: 3.2.0(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-jest: 28.11.0(@typescript-eslint/eslint-plugin@8.34.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3)
-      eslint-plugin-jest-formatting: 3.1.0(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-jsx-a11y: 6.10.2(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-n: 17.21.3(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3)
-      eslint-plugin-prettier: 5.5.3(eslint-config-prettier@9.1.2(eslint@9.32.0(jiti@2.4.2)))(eslint@9.32.0(jiti@2.4.2))(prettier@3.5.3)
-      eslint-plugin-promise: 7.2.1(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-react: 7.37.5(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-react-hooks: 5.2.0(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-sort-class-members: 1.21.0(eslint@9.32.0(jiti@2.4.2))
-=======
-      eslint: 9.32.0(jiti@2.4.2)
-      eslint-config-prettier: 9.1.2(eslint@9.32.0(jiti@2.4.2))
-      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-eslint-comments: 3.2.0(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-jest: 28.11.0(@typescript-eslint/eslint-plugin@8.34.1(@typescript-eslint/parser@8.34.1(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3)
-      eslint-plugin-jest-formatting: 3.1.0(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-jsx-a11y: 6.10.2(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-n: 17.21.3(eslint@9.32.0(jiti@2.4.2))(typescript@5.8.3)
-      eslint-plugin-prettier: 5.5.3(eslint-config-prettier@9.1.2(eslint@9.32.0(jiti@2.4.2)))(eslint@9.32.0(jiti@2.4.2))(prettier@3.6.2)
-      eslint-plugin-promise: 7.2.1(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-react: 7.37.5(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-react-hooks: 5.2.0(eslint@9.32.0(jiti@2.4.2))
-      eslint-plugin-sort-class-members: 1.21.0(eslint@9.32.0(jiti@2.4.2))
->>>>>>> origin/main
       globals: 15.15.0
       jsx-ast-utils: 3.3.5
       pkg-dir: 5.0.0
@@ -5170,8 +5120,8 @@ snapshots:
 
   '@typescript-eslint/project-service@8.34.1(typescript@5.8.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.34.1(typescript@5.8.3)
-      '@typescript-eslint/types': 8.34.1
+      '@typescript-eslint/tsconfig-utils': 8.38.0(typescript@5.8.3)
+      '@typescript-eslint/types': 8.38.0
       debug: 4.4.1
       typescript: 5.8.3
     transitivePeerDependencies:
@@ -5179,8 +5129,8 @@ snapshots:
 
   '@typescript-eslint/project-service@8.36.0(typescript@5.8.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.36.0(typescript@5.8.3)
-      '@typescript-eslint/types': 8.36.0
+      '@typescript-eslint/tsconfig-utils': 8.38.0(typescript@5.8.3)
+      '@typescript-eslint/types': 8.38.0
       debug: 4.4.1
       typescript: 5.8.3
     transitivePeerDependencies:
@@ -6148,7 +6098,7 @@ snapshots:
       '@eslint/compat': 1.2.8(eslint@9.32.0(jiti@2.5.1))
       eslint: 9.32.0(jiti@2.5.1)
 
-  eslint-config-prettier@10.1.5(eslint@9.32.0(jiti@2.5.1)):
+  eslint-config-prettier@10.1.8(eslint@9.32.0(jiti@2.5.1)):
     dependencies:
       eslint: 9.32.0(jiti@2.5.1)
 
@@ -6427,24 +6377,10 @@ snapshots:
       tinyglobby: 0.2.14
       yaml-eslint-parser: 1.3.0
 
-<<<<<<< HEAD
-  eslint-plugin-prettier@5.5.3(eslint-config-prettier@9.1.2(eslint@9.32.0(jiti@2.5.1)))(eslint@9.32.0(jiti@2.5.1))(prettier@3.5.3):
-||||||| fa90352
-  eslint-plugin-prettier@5.5.3(eslint-config-prettier@9.1.2(eslint@9.32.0(jiti@2.4.2)))(eslint@9.32.0(jiti@2.4.2))(prettier@3.5.3):
-=======
-  eslint-plugin-prettier@5.5.3(eslint-config-prettier@9.1.2(eslint@9.32.0(jiti@2.4.2)))(eslint@9.32.0(jiti@2.4.2))(prettier@3.6.2):
->>>>>>> origin/main
+  eslint-plugin-prettier@5.5.3(eslint-config-prettier@9.1.2(eslint@9.32.0(jiti@2.5.1)))(eslint@9.32.0(jiti@2.5.1))(prettier@3.6.2):
     dependencies:
-<<<<<<< HEAD
       eslint: 9.32.0(jiti@2.5.1)
-      prettier: 3.5.3
-||||||| fa90352
-      eslint: 9.32.0(jiti@2.4.2)
-      prettier: 3.5.3
-=======
-      eslint: 9.32.0(jiti@2.4.2)
       prettier: 3.6.2
->>>>>>> origin/main
       prettier-linter-helpers: 1.0.0
       synckit: 0.11.11
     optionalDependencies:
@@ -6688,24 +6624,10 @@ snapshots:
       esrecurse: 4.3.0
       estraverse: 5.3.0
 
-<<<<<<< HEAD
-  eslint-typegen@2.1.0(eslint@9.32.0(jiti@2.5.1)):
-||||||| fa90352
-  eslint-typegen@2.1.0(eslint@9.32.0(jiti@2.4.2)):
-=======
-  eslint-typegen@2.3.0(eslint@9.32.0(jiti@2.4.2)):
->>>>>>> origin/main
+  eslint-typegen@2.3.0(eslint@9.32.0(jiti@2.5.1)):
     dependencies:
-<<<<<<< HEAD
       eslint: 9.32.0(jiti@2.5.1)
-      json-schema-to-typescript-lite: 14.1.0
-||||||| fa90352
-      eslint: 9.32.0(jiti@2.4.2)
-      json-schema-to-typescript-lite: 14.1.0
-=======
-      eslint: 9.32.0(jiti@2.4.2)
       json-schema-to-typescript-lite: 15.0.0
->>>>>>> origin/main
       ohash: 2.0.11
 
   eslint-visitor-keys@3.4.3: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index bfbd0fa5..20df837e 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -44,7 +44,7 @@ catalogs:
     '@typescript-eslint/parser': 8.34.1
     ansis: 4.1.0
     eslint-config-flat-gitignore: 2.1.0
-    eslint-config-prettier: 10.1.5
+    eslint-config-prettier: 10.1.8
     eslint-flat-config-utils: 2.0.1
     eslint-merge-processors: 2.0.0
     eslint-plugin-antfu: 3.1.1