Remove conflicting gh-pages entry from package.json

Author: DDH2004

package.json

@@ -32,10 +32,6 @@
     "eslint": "^9.9.1",
     "eslint-plugin-react-hooks": "^5.1.0-rc.0",
     "eslint-plugin-react-refresh": "^0.4.11",
-<<<<<<< HEAD
-    "gh-pages": "^6.3.0",
-=======
->>>>>>> dev
     "globals": "^15.9.0",
     "postcss": "^8.4.35",
     "tailwindcss": "^3.4.1",