diff --git a/.obsidian/snippets/color.css b/.obsidian/snippets/color.css
index 607454d..b34ba42 100644
--- a/.obsidian/snippets/color.css
+++ b/.obsidian/snippets/color.css
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 .blue .cm-line.HyperMD-codeblock{
   background-color: #daedfc;
 }
diff --git a/Haina/Weekly/2025/2025-W16.md b/Haina/Weekly/2025/2025-W16.md
index fab6b1a..d7f282d 100644
--- a/Haina/Weekly/2025/2025-W16.md
+++ b/Haina/Weekly/2025/2025-W16.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ---
 Created: 2025-04-08 Tue
 Updated: 2025-04-15 17:27 Tue
diff --git a/Haina/项目/HotelHub/atta/heytrip_b2b分销接口对接说明.html b/Haina/项目/HotelHub/atta/heytrip_b2b分销接口对接说明.html
index 48114bf..7b3dd88 100644
--- a/Haina/项目/HotelHub/atta/heytrip_b2b分销接口对接说明.html
+++ b/Haina/项目/HotelHub/atta/heytrip_b2b分销接口对接说明.html
@@ -1173,6 +1173,7 @@ pre[class*="language-"] {
       list-style-type: decimal;
     }
   </style>
+<<<<<<< HEAD
   <style>.markdown-body a.footnote-ref {
   text-decoration: none;
 }