diff --git a/test1 b/test1
deleted file mode 100644
index 8b13789..0000000
--- a/test1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test3.txt b/test3.txt
new file mode 100644
index 0000000..b6b3e1a
--- /dev/null
+++ b/test3.txt
@@ -0,0 +1,2 @@
+To resolve merge conflict
+edited before second one