chore: merge conflicts

Signed-off-by: Alessandro De Blasis <alex@deblasis.net>

Author: deblasis

package.json

@@ -35,11 +35,7 @@
     "classnames": "^2.2.6",
     "debounce": "^1.2.1",
     "github-slugger": "^1.3.0",
-<<<<<<< HEAD
-    "next": "15.4.8",
-=======
     "next": "15.1.9",
->>>>>>> e22544e68d6fffda33332771efe27034739f35a4
     "next-remote-watch": "^1.0.0",
     "parse-numeric-range": "^1.2.0",
     "react": "^19.0.0",