diff --git a/README.md b/README.md
index 0f484d5..98e4540 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
 # git-example
 An example repo to demonstrate using git
+
+Marsha has made her changes to this REAMME doc
diff --git a/index.txt b/index.txt
new file mode 100644
index 0000000..1b99a36
--- /dev/null
+++ b/index.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+Now I am making even more changes
+=======
+Making some changes in the file on GitHub
+>>>>>>> d7f5e5d4a3d31e29d753aae8cfaa152a6c9ed73c