diff --git a/conflict.txt b/conflict.txt
new file mode 100644
index 0000000..cf6ecf8
--- /dev/null
+++ b/conflict.txt
@@ -0,0 +1 @@
+hello from vishal branch
diff --git a/hello.txt b/hello.txt
new file mode 100644
index 0000000..8714577
--- /dev/null
+++ b/hello.txt
@@ -0,0 +1 @@
+Forked and edited by Vishal