diff --git a/README.md b/README.md
index b4e4852..326f42d 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
 # A scratch repo on GitHub.com
+
+
+## Mojo
+
+my caption
+change made here to test merge conflict.
diff --git a/my-file.md b/my-file.md
new file mode 100644
index 0000000..1664817
--- /dev/null
+++ b/my-file.md
@@ -0,0 +1,4 @@
+# my-file
+This is my file that I've added.
+
+a line is added to test a merge conflict.
\ No newline at end of file