?

package.json

@@ -39,20 +39,6 @@
   },
   "homepage": "https://github.com/HoleInOneStudios/Quiz-Server#readme",
   "devDependencies": {
-<<<<<<< HEAD
-    "@types/jest": "^29.5.12",
-    "@types/jquery": "^3.5.30",
-    "jest": "^29.7.0",
-    "nodemon": "^3.1.4",
-    "pkg": "^5.8.1",
-    "supertest": "^6.3.4"
-  },
-  "dependencies": {
-    "dotenv": "^16.4.5",
-    "ejs": "^3.1.10",
-    "express": "^4.19.2",
-    "express-rate-limit": "^6.11.2",
-=======
     "@types/jest": "^29.0.0",
     "@types/jquery": "^3.5.14",
     "@yao-pkg/pkg": "^5.12.0",
@@ -68,7 +54,6 @@
     "ejs": "^3.1.9",
     "express": "^4.18.2",
     "express-rate-limit": "^7.4.0",
->>>>>>> 3f451fc9c53837b0200401884f519a51e572bf10
     "readline": "^1.3.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-latest/xlsx-latest.tgz"
   },