diff --git a/README.md b/README.md
new file mode 100644
index 0000000..ee70d9a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+Hello world 
+
+this change is made from the main branch'
+
+
+
diff --git a/conflict.txt b/conflict.txt
new file mode 100644
index 0000000..a4a561f
--- /dev/null
+++ b/conflict.txt
@@ -0,0 +1 @@
+This file contains the resolved changes from both the FEATURE and MAIN branches.
\ No newline at end of file