diff --git a/file1 b/file1
new file mode 100644
index 000000000..cfa245103
--- /dev/null
+++ b/file1
@@ -0,0 +1,7 @@
+<<<<<<< HEAD
+hello file 1!
+=======
+we are testing merge conflict of local repo and central repo!
+>>>>>>> 8869ee0ec0187878f5e15d0ce6c90b81b5b1a8c1
+
+tested successfully !
diff --git a/sneha b/sneha
new file mode 100644
index 000000000..44ce20549
--- /dev/null
+++ b/sneha
@@ -0,0 +1 @@
+hello sneha
diff --git a/testing b/testing
new file mode 100644
index 000000000..e8059f3f6
--- /dev/null
+++ b/testing
@@ -0,0 +1 @@
+ dealing with branch !