diff --git a/package.json b/package.json
index 0d755f6..f5f3378 100644
--- a/package.json
+++ b/package.json
@@ -34,19 +34,11 @@
         "@typescript-eslint/parser": "^6.7.3",
         "@vencord/types": "^0.1.2",
         "dotenv": "^16.3.1",
-<<<<<<< HEAD
-        "electron": "^26.2.2",
-        "electron-builder": "^24.6.4",
-        "esbuild": "^0.18.20",
-        "eslint": "^8.50.0",
-        "eslint-config-prettier": "^8.10.0",
-=======
         "electron": "26.2.3",
         "electron-builder": "^24.6.3",
         "esbuild": "^0.18.17",
         "eslint": "^8.46.0",
         "eslint-config-prettier": "^8.9.0",
->>>>>>> 2e5c450b14553561ad6ca505152d2a93766ca138
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-license-header": "^0.6.0",
         "eslint-plugin-path-alias": "^1.0.0",