diff --git a/first-page.md b/first-page.md
index eb9d075..0e2902d 100644
--- a/first-page.md
+++ b/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!
+