diff --git a/conflict.txt b/conflict.txt
index 62694b6..800d57c 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,2 +1,3 @@
 hello world 
 change made in main branch
+This is the main branch version
\ No newline at end of file