diff --git a/package.json b/package.json
index 4df08f9..23ccada 100644
--- a/package.json
+++ b/package.json
@@ -26,10 +26,7 @@
     "dotenv": "^16.5.0",
     "express": "^4.21.2",
     "firebase-admin": "^13.3.0",
-<<<<<<< HEAD
     "googleapis": "^148.0.0",
-=======
->>>>>>> 917b12bb273711b9117a93963c6ee0ff957376a8
     "nodejs": "^0.0.0",
     "ping": "^0.4.4",
     "pm2": "^6.0.5",