diff --git a/readme.txt b/readme.txt
index 982b777..c3c3cfb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,10 @@
 Git is a distributed version control system.
 Git is free software.
 Git has a mutable index called stage.
-change online.
\ No newline at end of file
+change online.
+merge after.
+
+conlict.
+dev change
+
+bilibili