diff --git a/my-file.md b/my-file.md
new file mode 100644
index 00000000..003cffb9
--- /dev/null
+++ b/my-file.md
@@ -0,0 +1,6 @@
+Test
+
+These are more changes
+
+These are conflict changes
+Sara-first change