diff --git a/file1 b/file1
new file mode 100644
index 0000000..16b14f5
--- /dev/null
+++ b/file1
@@ -0,0 +1 @@
+test file
diff --git a/file4 b/file4
new file mode 100644
index 0000000..5f1adc6
--- /dev/null
+++ b/file4
@@ -0,0 +1,3 @@
+test
+
+this line to test merging from b3