diff --git a/repo/js/芙芙挂机暗杀流/manifest.json b/repo/js/芙芙挂机暗杀流/manifest.json
index 42cd30f8..cbf89bfb 100644
--- a/repo/js/芙芙挂机暗杀流/manifest.json
+++ b/repo/js/芙芙挂机暗杀流/manifest.json
@@ -1,20 +1,3 @@
-<<<<<<< HEAD
-{
-  "manifest_version": 1,
-  "name": "芙芙挂机暗杀流", 
-  "version": "1.0", 
-  "bgi_version": "0.37.2", 
-  "description": "用于芙宁娜海鲜挂机暗杀地方传奇", 
-  "authors": [
-    {
-      "name": "起个名字好难",
-      "link": "https://mualani.fun"
-    }
-  ],
-  "settings_ui": "settings.json",
-  "main": "main.js"
-}
-=======
 {
     "manifest_version": 1,
     "name": "芙芙挂机暗杀流",
@@ -30,4 +13,3 @@
     "settings_ui": "settings.json",
     "main": "main.js"
 }
->>>>>>> 7bd87de6de79f095e156c9c910f148dc9aa7f781