Updates first-page.md

Auto commit by GitBook Editor

first-page.md

@@ -13,3 +13,5 @@ and what about conflicts ?
 
 here is what would cause a conflict hehe.
 
+ok well done, gitbook is able to resolve conflicts!
+