diff --git a/conflict.txt b/conflict.txt
index 26ddf3d..6825197 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,5 @@
 git is very useful.
 
 please keep your line here:
+
+git is better now at conflict resolution.