fix: resolve frontend config merge conflict

Author: Nishant-S-Bhardwaj

frontend/next.config.ts

@@ -2,16 +2,14 @@ import path from "node:path";
 import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
-<<<<<<< HEAD
-  // The workspace root lives one level above this directory. Pinning it here
-  // prevents Turbopack from inferring a wrong root when stray package-lock
-  // files exist outside the repo (e.g. ~/package-lock.json).
+  output: "standalone",
+
+  // The workspace root lives one level above this directory.
+  // Pin it to prevent Turbopack from inferring the wrong root.
   turbopack: {
     root: path.join(path.dirname(new URL(import.meta.url).pathname), ".."),
   },
-=======
-  output: 'standalone',
->>>>>>> 90c0dc1 (docker: optimize backend/frontend images for #1335 (non-root, healthchecks, size reduction - see PR description for details))
+
   // Enable tree-shaking for icon/utility libraries to reduce per-route
   // bundle sizes (Issue #1254).
   experimental: {
@@ -21,6 +19,7 @@ const nextConfig: NextConfig = {
       "@tanstack/react-virtual",
     ],
   },
+
   async redirects() {
     return [
       {

package-lock.json

@@ -13,6 +13,7 @@
     "verify-security": "node scripts/verify-security-setup.js"
   },
   "devDependencies": {
+    "@playwright/test": "^1.62.1",
     "@vitest/coverage-v8": "^3.2.7",
     "husky": "^9.1.7",
     "lint-staged": "^17.0.7",