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