diff --git a/testfile2 b/testfile2
index f43c15f41..08ae3bb06 100644
--- a/testfile2
+++ b/testfile2
@@ -1,2 +1,5 @@
+<<<<<<< HEAD
 This is line1.
 This is line2.
+=======
+>>>>>>> parent of f5161cf... created test file