diff --git a/Haina/Templates/W-log.md b/Haina/Templates/W-log.md
index e66cae0..4775df0 100644
--- a/Haina/Templates/W-log.md
+++ b/Haina/Templates/W-log.md
@@ -1,6 +1,6 @@
 ---
-Created: <% tp.file.creation_date("YYYY-MM-DD ddd") %>
-Updated: 
+Created: 2025-07-08 20:13 Tue
+Updated: 2025-07-08 20:16 Tue
 tags:
   - 周报
 ---
@@ -189,6 +189,8 @@ for (let day = 0; day < 2; day++) {
 
 ---
 
+## Done
+
 > [!check] Latest 2 weeks
 >
 > ```tasks
diff --git a/Haina/Weekly/2025/2025-W30.md b/Haina/Weekly/2025/2025-W30.md
new file mode 100644
index 0000000..8737a1c
--- /dev/null
+++ b/Haina/Weekly/2025/2025-W30.md
@@ -0,0 +1,238 @@
+---
+Created: 2025-07-08 20:13 Tue
+Updated: 2025-07-08 20:17 Tue
+tags:
+  - 周报
+---
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q3|Q3]] / [[Haina/Monthly/2025-07|July]] / ❮ [[Haina/Weekly/2025/2025-W29|Week 29]] | Week 30 | [[Haina/Weekly/2025/2025-W31|Week 31]] ❯ / [[Haina/Daily/2025-07-14|14 Mon]] - [[Haina/Daily/2025-07-15|15 Tue]] - [[Haina/Daily/2025-07-16|16 Wed]] - [[Haina/Daily/2025-07-17|17 Thu]] - [[Haina/Daily/2025-07-18|18 Fri]] - [[Haina/Daily/2025-07-19|19 Sat]] - [[Haina/Daily/2025-07-20|20 Sun]] ❯ [[Haina/Daily/2025-07-21|21 Mon]] - [[Haina/Daily/2025-07-22|22 Tue]] - 
+
+---
+
+*2025-07-22 Tue*  
+
+## 上周工作
+
+### 重点工作
+####
+1. 
+
+### 维护工作
+#### 
+1. 
+
+## 本周计划
+1. 
+
+> [!info]- 最近
+>
+> ```tasks
+> (not done) OR (done after 2025-07-08)
+> path includes Haina
+> filter by function task.file.path.includes('项目')
+> filter by function task.file.property('Updated') > '2025-06-01'
+> group by heading
+> ```
+
+---
+
+## Priority
+
+> [!danger] 🔴重要且紧急⏫🔺
+>
+> ```tasks
+> (not done) OR (done after 2025-07-15)
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'High' || task.priorityName === 'Highest')
+> sort by path reverse
+> sort by done
+> sort by heading
+> group by heading
+> ```
+
+> [!warning] 🟠不重要紧急🔼
+>
+> ```tasks
+> (not done) OR (done after 2025-07-15)
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Medium')
+> sort by path reverse
+> sort by done
+> sort by heading
+> group by heading
+> ```
+
+> [!important] 🟡重要不紧急🔽
+>
+> ```tasks
+> (not done) OR (done after 2025-07-15)
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Normal')
+> sort by path reverse
+> sort by done
+> sort by heading
+> group by heading
+> ```
+
+> [!info] 🟢不重要不紧急🔽⏬
+>
+> ```tasks
+> (not done) OR (done after 2025-07-15)
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'Lowest' || task.priorityName === 'Low' || task.priorityName === 'None')
+> sort by path reverse
+> sort by done
+> sort by heading
+> ```
+
+> [!info]- 转移
+>
+> ```tasks
+> (not done) OR (done after 2025-04-29)
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'quote')
+> group by heading
+> ``` 
+
+---
+
+
+> [!danger] 🔴重要且紧急⏫🔺
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'High' || task.priorityName === 'Highest')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!warning] 🟠不重要紧急🔼
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Medium')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!important] 🟡重要不紧急🔽
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Normal')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!info] 🟢不重要不紧急⏬
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'Lowest' || task.priorityName === 'None')
+> sort by path reverse
+> sort by heading
+> ```
+
+
+---
+
+## Done
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after 2025-07-08
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> group by heading
+> ```
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W28) OR (path includes W29 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+> 暂时不用
+> ```tasks--
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
deleted file mode 100644
index e46af7e..0000000
--- a/conflict-files-obsidian-git.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Conflicts
-Please resolve them and commit them using the commands `Obsidian Git: Commit all changes` followed by `Obsidian Git: Push`
-(This file will automatically be deleted before commit)
-[[#Additional Instructions]] available below file list
-
-- Not a file: .obsidian/community-plugins.json
-- [[Haina/Templates/W-log]]
-- [[Haina/Weekly/2025/2025-W16]]
-- [[Haina/Weekly/2025/2025-W17]]
-- [[Haina/项目/HT数据分析/CT商旅数据统计]]
-
-# Additional Instructions
-I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
-
-```diff
-<<<<<<< HEAD
-    File changes in local repository
-=======
-    File changes in remote repository
->>>>>>> origin/main
-```
\ No newline at end of file