diff --git a/package.json b/package.json
index d44b178..9a4ff83 100644
--- a/package.json
+++ b/package.json
@@ -25,12 +25,7 @@
     "discord.js": "^14.18.0",
     "dotenv": "^16.4.7",
     "express": "^4.21.2",
-<<<<<<< HEAD
     "nodejs": "^0.0.0",
     "ping": "^0.4.4"
-=======
-    "ping": "^0.4.4",
-    "whois-json": "^2.0.4"
->>>>>>> d97cd72f3be558cef653ec487ea655cca97cd7cd
   }
 }