diff --git a/1.txt.orig b/1.txt.orig
new file mode 100644
index 0000000..427664a
--- /dev/null
+++ b/1.txt.orig
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+2222
+=======
+1111
+>>>>>>> 1
diff --git a/2.txt b/2.txt
new file mode 100644
index 0000000..27f29bc
--- /dev/null
+++ b/2.txt
@@ -0,0 +1 @@
+2222
\ No newline at end of file