diff --git a/package-lock.json b/package-lock.json
index a5aaf875..c988fdf4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,12 +10,8 @@
       "license": "MIT",
       "dependencies": {
         "@discordjs/opus": "^0.8.0",
-<<<<<<< HEAD
         "@discordjs/rest": "^0.5.0",
         "@discordjs/voice": "^0.10.0",
-=======
-        "@discordjs/voice": "^0.9.0",
->>>>>>> ec0ebb06b7bbd2c4f82f88dee2351e7e66c02345
         "@distube/soundcloud": "^1.1.0",
         "@distube/spotify": "^1.2.1",
         "@distube/yt-dlp": "^1.0.2",
diff --git a/package.json b/package.json
index 5a1c45a1..b3b77955 100644
--- a/package.json
+++ b/package.json
@@ -27,12 +27,8 @@
   },
   "dependencies": {
     "@discordjs/opus": "^0.8.0",
-<<<<<<< HEAD
     "@discordjs/rest": "^0.5.0",
     "@discordjs/voice": "^0.10.0",
-=======
-    "@discordjs/voice": "^0.9.0",
->>>>>>> ec0ebb06b7bbd2c4f82f88dee2351e7e66c02345
     "@distube/soundcloud": "^1.1.0",
     "@distube/spotify": "^1.2.1",
     "@distube/yt-dlp": "^1.0.2",