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/sbl.txt b/sbl.txt
index 137a0a1..34a8605 100644
--- a/sbl.txt
+++ b/sbl.txt
@@ -1 +1 @@
-我改了
\ No newline at end of file
+冲突测试
\ No newline at end of file
diff --git a/this_is_dev.txt b/this_is_dev.txt
index 4829364..c59d9b6 100644
--- a/this_is_dev.txt
+++ b/this_is_dev.txt
@@ -1 +1 @@
-dev__init__
\ No newline at end of file
+d
\ No newline at end of file