diff --git a/test.txt b/test.txt
index 999bcbe..b348989 100644
--- a/test.txt
+++ b/test.txt
@@ -4,3 +4,5 @@ new line
 test change
 wowie
 hi
+test
+conflicting change