Resolve conflicts with next version

Author: rammba

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.11",
->>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
     "next-remote-watch": "^1.0.0",
     "parse-numeric-range": "^1.2.0",
     "react": "^19.0.0",