diff --git a/Calendar/Diary/2025-01-24.md b/Calendar/Diary/2025-01-24.md
index bd4e6285..afe9ec96 100644
--- a/Calendar/Diary/2025-01-24.md
+++ b/Calendar/Diary/2025-01-24.md
@@ -1,16 +1,10 @@
 ---
 atlas: "[[DailyNote]]"
-<<<<<<< HEAD
+
 completed: 6
 created: 2025-01-24 03:51:43
 incomplete: 0
 modified: 2025-01-25 03:20:40
-=======
-completed: 3
-created: 2025-01-24 03:51:43
-incomplete: 6
-modified: 2025-01-24 03:59:30
->>>>>>> origin/master
 tags:
   - DailyNote
 title: 2025-01-24
@@ -25,16 +19,9 @@ total: 6
 
 - [x] 更新账本 📅 2025-01-24 ✅ 2025-01-24
 - [x] 注册转数快 📅 2025-01-24 ✅ 2025-01-24
-<<<<<<< HEAD
 - [x] 通关原神本月深渊 📅 2025-01-24 ✅ 2025-01-24
 - [x] 规划国内外银行卡各自用途 📅 2025-01-24 ✅ 2025-01-24
-=======
-- [ ] 部署剪贴板服务器 📅 2025-01-24 
-- [ ] 通关原神本月深渊 📅 2025-01-24 
-- [ ] 收集原神大世界宝箱 📅 2025-01-24 
-- [ ] 设计个人服务器网络架构 📅 2025-01-24 
-- [ ] 规划国内外银行卡各自用途 📅 2025-01-24 
->>>>>>> origin/master
+
 
 # 学习