diff --git a/toshiki.txt b/toshiki.txt
index f775a13..871f38c 100644
--- a/toshiki.txt
+++ b/toshiki.txt
@@ -1,2 +1,6 @@
 Hello_World
+<<<<<<< HEAD
 Hello_World
+=======
+end
+>>>>>>> 9e7a8cbeedf56c529ed20eeeeb3302706ba8ddd7