diff --git a/testfile2 b/testfile2
new file mode 100644
index 000000000..d56080a96
--- /dev/null
+++ b/testfile2
@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+This is line1.
+This is line2.
+=======
+>>>>>>> parent of f5161cf... created test file
+=======
+>>>>>>> parent of f5161cf... created test file