diff --git a/content/post/2026/2026-02-15-Amigo主题开源及EdgeOne部署指南/index.md b/content/post/2026/2026-02-15-Amigo主题开源及EdgeOne部署指南/index.md
index 234a71e3..61c69bda 100644
--- a/content/post/2026/2026-02-15-Amigo主题开源及EdgeOne部署指南/index.md
+++ b/content/post/2026/2026-02-15-Amigo主题开源及EdgeOne部署指南/index.md
@@ -1,12 +1,7 @@
 ---
 layout: post
-<<<<<<< HEAD
 title: Amigo：一个简约的朋友圈风格 Hugo 主题
 date: 2026-02-15T18:00:00+08:00
-=======
-title: Amigo：一个简约大气的朋友圈风格 Hugo 主题
-date: 2026-02-15T10:00:00.000Z
->>>>>>> f6ee547248d80facfffd48057fff11b784e70f14
 author: 小赵同学
 categories:
   - 折腾