diff --git a/file1.txt b/file1.txt
index 95fe149..9560425 100644
--- a/file1.txt
+++ b/file1.txt
@@ -1 +1,5 @@
-file 1 branch 2
+<<<<<<< HEAD
+file 1
+=======
+file 1
+>>>>>>> branch1
diff --git a/file2.txt b/file2.txt
index 181e01a..af3d62c 100644
--- a/file2.txt
+++ b/file2.txt
@@ -1 +1,5 @@
-file 2 branch 2
+<<<<<<< HEAD
+file 2
+=======
+file 2
+>>>>>>> branch1
diff --git a/file3.txt b/file3.txt
index 6b484d1..b8faef5 100644
--- a/file3.txt
+++ b/file3.txt
@@ -1 +1,5 @@
-file 3 branch 2
+<<<<<<< HEAD
+file 3
+=======
+file 3
+>>>>>>> branch1