diff --git a/toshiki.txt b/toshiki.txt
index 9ef3d89..77aed32 100644
--- a/toshiki.txt
+++ b/toshiki.txt
@@ -1,10 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-Hello_WorldHello_World
-=======
 Hello_World
-end
->>>>>>> 5a1963dc918399cbd3198d55ebb06ae94f7d920e
-=======
-ada
->>>>>>> 78cbc4605092af0eafbb2cec5b0e03994431945a