Resolve merge conflict in package.json

Updated 'next' version and removed conflicting dependencies.

Author: ph1p

package.json

@@ -37,16 +37,9 @@
     "date-fns": "^2.16.1",
     "debounce": "^1.2.1",
     "github-slugger": "^1.3.0",
-<<<<<<< HEAD
     "next": "15.4.9",
     "next-remote-watch": "^1.0.0",
     "parse-numeric-range": "^1.3.0",
-=======
-    "next": "15.1.12",
-    "next-remote-watch": "^1.0.0",
-    "parse-numeric-range": "^1.2.0",
-    "raw-loader": "^4.0.2",
->>>>>>> 6be2b020a0cabf2fd6dbff5c42c399b8ac323bca
     "react": "^19.0.0",
     "react-collapsed": "4.2.0",
     "react-dom": "^19.0.0",
@@ -99,12 +92,7 @@
     "postcss-flexbugs-fixes": "4.2.1",
     "postcss-preset-env": "^6.7.0",
     "prettier": "^2.5.1",
-<<<<<<< HEAD
     "reading-time": "^1.5.0",
-=======
-    "react-server-dom-webpack": "^19.2.4",
-    "reading-time": "^1.2.0",
->>>>>>> 6be2b020a0cabf2fd6dbff5c42c399b8ac323bca
     "remark": "^12.0.1",
     "remark-external-links": "^7.0.0",
     "remark-html": "^12.0.0",