conflicts solved

node_modules/.modules.yaml

@@ -0,0 +1,20 @@
+hoistPattern:
+  - '*'
+hoistedDependencies: {}
+included:
+  dependencies: true
+  devDependencies: true
+  optionalDependencies: true
+injectedDeps: {}
+layoutVersion: 5
+nodeLinker: isolated
+packageManager: pnpm@10.6.1
+pendingBuilds: []
+prunedAt: Fri, 07 Mar 2025 14:29:12 GMT
+publicHoistPattern: []
+registries:
+  default: https://registry.npmjs.org/
+skipped: []
+storeDir: C:\Users\ckovl\AppData\Local\pnpm\store\v10
+virtualStoreDir: C:\Users\ckovl\OneDrive\Документы\boilerplate\node_modules\.pnpm
+virtualStoreDirMaxLength: 60