diff --git a/happypoker b/happypoker
new file mode 160000
index 0000000..3b688db
--- /dev/null
+++ b/happypoker
@@ -0,0 +1 @@
+Subproject commit 3b688dbc97c747bd045642a5d7f944f91c94a597
diff --git a/jian_commit.txt b/jian_commit.txt
new file mode 100644
index 0000000..dd61377
--- /dev/null
+++ b/jian_commit.txt
@@ -0,0 +1 @@
+提交提交提交
\ No newline at end of file
diff --git a/requirements_1.txt b/requirements_1.txt
index 6b7c026..c496d85 100644
--- a/requirements_1.txt
+++ b/requirements_1.txt
@@ -1,4 +1,4 @@
-# FastAPI 核心框架（保留你指定的版本）
+# FastAPI 核心框架（保留你指定的版本）  %简文瑞埋下的一个冲突
 fastapi~=0.124.2
 # ASGI 服务器（带standard扩展，适配最新版）
 uvicorn[standard]~=0.38.0
diff --git a/sbl.txt b/sbl.txt
new file mode 100644
index 0000000..34a8605
--- /dev/null
+++ b/sbl.txt
@@ -0,0 +1 @@
+冲突测试
\ No newline at end of file