diff --git a/diss.py b/diss.py
index 29cfca6..0a39293 100644
--- a/diss.py
+++ b/diss.py
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
-=======
 from time import sleep
->>>>>>> master
 from requests import get
 from pagermaid.listener import listener
 
@@ -9,14 +6,6 @@ from pagermaid.listener import listener
           description="儒雅随和版祖安语录。")
 async def diss(context):
     await context.edit("获取中 . . .")
-<<<<<<< HEAD
-    req = get("https://nmsl.shadiao.app/api.php?level=min&from=tnt")
-    if req.status_code == 200:
-        res = req.text
-        await context.edit(res, parse_mode='html', link_preview=False)
-    else:
-        await context.edit("出错了呜呜呜 ~ 无法访问到 API 服务器 。")
-=======
     status=False
     for _ in range(20): #最多尝试20次
         req = get("https://nmsl.shadiao.app/api.php?level=min&from=tntcrafthim")
@@ -31,20 +20,11 @@ async def diss(context):
         await context.edit("出错了呜呜呜 ~ 试了好多好多次都无法访问到 API 服务器 。")
         sleep(2)
         await context.delete()
->>>>>>> master
 
 @listener(is_plugin=True, outgoing=True, command="biss",
           description="加带力度版祖安语录。")
 async def biss(context):
     await context.edit("获取中 . . .")
-<<<<<<< HEAD
-    req = get("https://nmsl.shadiao.app/api.php?&from=tnt")
-    if req.status_code == 200:
-        res = req.text
-        await context.edit(res, parse_mode='html', link_preview=False)
-    else:
-        await context.edit("出错了呜呜呜 ~ 无法访问到 API 服务器 。")
-=======
     status=False
     for _ in range(20): #最多尝试20次
         req = get("https://nmsl.shadiao.app/api.php?from=tntcrafthim")
@@ -58,5 +38,4 @@ async def biss(context):
     if status == False:
         await context.edit("出错了呜呜呜 ~ 试了好多好多次都无法访问到 API 服务器 。")
         sleep(2)
-        await context.delete()
->>>>>>> master
+        await context.delete()
\ No newline at end of file
diff --git a/list.json b/list.json
index d2c3824..02a82d7 100644
--- a/list.json
+++ b/list.json
@@ -252,10 +252,10 @@
         },
         {
             "name": "diss",
-            "version": "1.0",
+            "version": "1.1",
             "section": "chat",
             "maintainer": "TNTcraftHIM",
-            "size": "1.0 kb",
+            "size": "1.5 kb",
             "supported": true,
             "des-short": "祖安对线语录",
             "des": "让你在祖安大舞台能够时而儒雅，时而火力全开的对线。命令：diss，biss。"