diff --git a/conflict.txt b/conflict.txt
index 62694b6..47375f1 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,2 +1,2 @@
 hello world 
-change made in main branch
+change made in feature branch branch