diff --git a/hello.c b/hello.c
new file mode 100644
index 0000000..e69de29
diff --git a/note/tesk.md b/note/tesk.md
index 59f50d7..98e2ca9 100644
--- a/note/tesk.md
+++ b/note/tesk.md
@@ -10,4 +10,6 @@
 ~~~
 
 #### 表格
-
+~~~
+添加冲突
+~~~