diff --git a/package.json b/package.json
index 3d48bac..ebc2e3a 100644
--- a/package.json
+++ b/package.json
@@ -29,11 +29,7 @@
     "drizzle-orm": "^0.45.2",
     "lucide-react": "^1.31.0",
     "material-symbols": "^0.44.12",
-<<<<<<< HEAD
-    "next": "16.2.6",
-=======
     "next": "16.3.0",
->>>>>>> main
     "next-intl": "^4.13.6",
     "next-themes": "^0.4.6",
     "react": "^19.2.8",