diff --git a/试一试.md b/试一试.md
new file mode 100644
index 0000000..166b0f2
--- /dev/null
+++ b/试一试.md
@@ -0,0 +1 @@
+# 解决冲突
\ No newline at end of file