diff --git a/test_note.txt b/test_note.txt
new file mode 100644
index 0000000..ec5bccf
--- /dev/null
+++ b/test_note.txt
@@ -0,0 +1 @@
+YaoTiancheng_branch 分支：2025-10-22 测试冲突内容
\ No newline at end of file