diff --git a/conflict.txt b/conflict.txt
index 6a82720..d462a98 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,4 @@
 git is good at conflict resolution.
 
 please keep your line here:
+1. Git is fun