fix: 修复合并出现的冲突

package.json

@@ -1,13 +1,7 @@
 {
-<<<<<<< HEAD
-  "name": "NeteaseCloudMusicApi",
-  "version": "4.25.0",
-  "description": "网易云音乐 NodeJS 版 API",
-=======
   "name": "@neteaseapireborn/api",
-  "version": "4.28.10",
+  "version": "4.28.28",
   "description": "为停更的网易云音乐 NodeJs API 提供持续的维护！",
->>>>>>> 05bedc6 (feat: 支持直接在请求歌曲url使用unm server)
   "scripts": {
     "start": "node app.js",
     "test": "mocha -r intelli-espower-loader -t 60000 server.test.js main.test.js --exit",
@@ -71,9 +65,10 @@
     "data"
   ],
   "dependencies": {
+    "@unblockneteasemusic/server": "^0.27.10",
     "axios": "^1.2.2",
-    "dotenv": "^16.0.3",
     "crypto-js": "^4.2.0",
+    "dotenv": "^16.0.3",
     "express": "^4.17.1",
     "express-fileupload": "^1.1.9",
     "md5": "^2.3.0",