diff --git a/first-page.md b/first-page.md
index 66fbef0..f395f52 100644
--- a/first-page.md
+++ b/first-page.md
@@ -7,3 +7,4 @@ but will we be able to use the desktop editor with out the online gitbook servic
 ok i can push to gogs with gitbook, good!
 but what if i push a commit from else where, how gitbook will resolve that ?
 
+here is what would cause a conflict hehe.