diff --git a/customTitle.json b/customTitle.json
index f91e9fc..9ca50c7 100644
--- a/customTitle.json
+++ b/customTitle.json
@@ -1625,7 +1625,6 @@
       ]
     },
     {
-<<<<<<< HEAD
       "id": "35iPH7jJLH0",
       "title": "[一二三][初音ミク] 花が落ちたので、",
       "comment": null,
@@ -2740,7 +2739,7 @@
     },
     {
       "id": "X7OnmTYTzKU",
-      "title": "【Blue Archive】君をなぞるだけの夜 - AI空崎ヒナ",
+      "title": "[理想放逐P][秋葵AKIAOI][空崎ヒナ] 君をなぞるだけの夜",
       "comment": "",
       "playlists": [
         {
@@ -2750,12 +2749,6 @@
           "position": 1
         }
       ]
-=======
-      "id": "X7OnmTYTzKU",
-      "title": "【Blue Archive】君をなぞるだけの夜 - AI空崎ヒナ",
-      "comment": null,
-      "playlists": []
->>>>>>> 400cc1f (update customTitle.json)
     },
     {
       "id": "fgwBoi_6_Ys",