diff --git a/first-page.md b/first-page.md
index 2767b9e..eb9d075 100644
--- a/first-page.md
+++ b/first-page.md
@@ -11,5 +11,5 @@ ok i can pull
 
 and what about conflicts ?
 
-
+here is what would cause a conflict hehe.