diff --git a/README.md b/README.md
index 7f75ed0..212e4d1 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,16 @@ this is a test repo for web28
 
 
 testing testing 123
+<<<<<<< HEAD
+nicks test
+=======
 
+Oh look! I've made another change. 
+=======
 
-Oh look! I've made another change. 
\ No newline at end of file
+
+
+
+nicks test
+second test
+>>>>>>> 956ac142a1ef3c5c3627b94ffb71641f433d4aae