diff --git a/readMe.txt b/readMe.txt
index fe81e82..fbab6c2 100644
--- a/readMe.txt
+++ b/readMe.txt
@@ -1,2 +1,6 @@
 jakeOwns
+<<<<<<< HEAD
+test branch
+=======
 plawks
+>>>>>>> refs/remotes/origin/master