diff --git a/bar.txt b/bar.txt
index 3227c47..11e77ef 100644
--- a/bar.txt
+++ b/bar.txt
@@ -1,3 +1,4 @@
-rab
+bar
 
 I'm trying to create a merge conflict with sapling.
+I've added this after the fact too.
diff --git a/flip.txt b/flip.txt
new file mode 100644
index 0000000..6e31747
--- /dev/null
+++ b/flip.txt
@@ -0,0 +1,4 @@
+flip
+
+now these changes are dependent on flip existing already
+
diff --git a/foo.txt b/foo.txt
new file mode 100644
index 0000000..b0f7514
--- /dev/null
+++ b/foo.txt
@@ -0,0 +1,3 @@
+foo
+
+I added this after committing the original.