diff --git a/conflict.txt b/conflict.txt
index 47375f1..a4a561f 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,2 +1 @@
-hello world 
-change made in feature branch branch
+This file contains the resolved changes from both the FEATURE and MAIN branches.
\ No newline at end of file