Not even sure why git put these lines in.

Update/zonik_005_vm00_n01.txt

@@ -51,7 +51,6 @@ void dialog003()
 		   NULL, "\"Ahahaha~ Keiichi-kun is bending forward... kyute kyute!!\"", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 }
-<<<<<<< HEAD
 
 void dialog004()
 {
@@ -125,5 +124,3 @@ void dialog006()
 		   NULL, "I heard what sounded like a \"zhazhing\" three times.  His 3-gauge super!?", Line_Normal);
 	ClearMessage();
 }
-=======
->>>>>>> 3895b805810bfc1a554b8e247727a020a188e2f5