@@ -20,27 +20,15 @@
     "test:e2e:update": "playwright test --update-snapshots"
   },
   "dependencies": {
-<<<<<<< before updating
-    "@awesome.me/webawesome": "^3.13.0"
-=======
     "@awesome.me/webawesome": "^3.14.0"
->>>>>>> after updating
   },
   "devDependencies": {
     "@axe-core/playwright": "^4.13.0",
     "@playwright/test": "^1.63.0",
-<<<<<<< before updating
-    "@types/node": "^26.6.2",
-    "oxfmt": "^0.70.0",
-    "oxlint": "^1.85.0",
-    "typescript": "^7.0.2",
-    "vite": "^8.3.0"
-=======
     "@types/node": "^26.6.3",
     "oxfmt": "^0.70.0",
     "oxlint": "^1.85.0",
     "typescript": "^5.9.3",
     "vite": "^8.3.1"
->>>>>>> after updating
   }
 }