diff --git a/conflict.txt b/conflict.txt
index 26ddf3d..d48fea4 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,4 @@
 git is very useful.
-
 please keep your line here:
+git is whipped at conflict resolution.
+Now watch me git...