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