diff --git a/README.md b/README.md
index f6acfcb..826b9a8 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
+<<<<<<< Updated upstream
 # hello!
+=======
+# hello!#T
+>>>>>>> Stashed changes