diff --git a/readme.txt b/readme.txt
index bdae587..16f7746 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,4 +3,4 @@ Git is free software distributed under the GPL..
 
 Creating a new branch is quick
 
-Creating feature1
+delete conflict