Merge conflicts

package.json

@@ -57,22 +57,18 @@
     "sanitize-html": "^2.13.0"
   },
   "devDependencies": {
-    "@chromatic-com/storybook": "^1.2.25",
+    "@chromatic-com/storybook": "^1.6.1",
     "@prisma/client": "^5.11.0",
     "@storybook/addon-a11y": "8.3.0-alpha.8",
-    "@storybook/addon-actions": "8.3.0-alpha.8",
     "@storybook/addon-essentials": "8.3.0-alpha.8",
     "@storybook/addon-interactions": "8.3.0-alpha.8",
     "@storybook/addon-viewport": "8.3.0-alpha.8",
     "@storybook/blocks": "8.3.0-alpha.8",
-    "@storybook/builder-vite": "8.3.0-alpha.8",
     "@storybook/csf": "^0.1.11",
     "@storybook/experimental-addon-vitest": "8.3.0-alpha.8",
     "@storybook/nextjs": "8.3.0-alpha.8",
     "@storybook/react": "8.3.0-alpha.8",
     "@storybook/test": "8.3.0-alpha.8",
-    "@testing-library/dom": "^10.4.0",
-    "@testing-library/react": "^16.0.0",
     "@total-typescript/tsconfig": "^1.0.4",
     "@types/node": "^20",
     "@types/react": "^18",
@@ -92,7 +88,7 @@
     "mockdate": "^3.0.5",
     "module-alias": "^2.2.3",
     "msw": "^2.3.4",
-    "msw-storybook-addon": "^2.0.0",
+    "msw-storybook-addon": "^2.0.3",
     "nyc": "^15.1.0",
     "playwright": "^1.43.0",
     "prettier": "^3.2.5",