Auto commit by GitBook Editor
@@ -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!
+