Merge pull request 'learn_conflict' (#1) from learn_conflict into master

Reviewed-on: wangxinyu2/task_log#1

note/tesk.md

@@ -8,6 +8,10 @@
 
 ~~~	
 ~~~
+添加冲突
+~~~
 
 #### 表格
-
+~~~
+添加冲突
+~~~