diff --git "a/_posts/2024-09-25-\345\217\244\347\233\270\346\200\235\346\233\262.md" "b/_posts/2024-09-25-\345\217\244\347\233\270\346\200\235\346\233\262.md"
index 0f45b20..366de77 100644
--- "a/_posts/2024-09-25-\345\217\244\347\233\270\346\200\235\346\233\262.md"
+++ "b/_posts/2024-09-25-\345\217\244\347\233\270\346\200\235\346\233\262.md"
@@ -6,6 +6,7 @@ categories: [影视]
 ---
 
 # 最爱的阿鸢
+<<<<<<< HEAD
 ![img-description](/fig/1.png "喜欢")
 
 ![img-description](/fig/2.png "可爱")
@@ -14,3 +15,13 @@ categories: [影视]
 
 # 视频
 {% include embed/bilibili.html id='BV1ju41157nT' %}
+=======
+![img-description](../fig/1.png)
+喜欢
+
+![img-description](../fig/2.png)
+可爱
+
+![img-description](../fig/3.png)
+鸢的笑
+>>>>>>> eb3d487e681028118f2cb8875935f758c8cd0e50