diff --git a/conflict.txt b/conflict.txt
index 9214f7c..eea5248 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1 +1,2 @@
+conflict from branch y
 conflict from branch x