Fixed conflicts to merge kickbox in.

Themes/_fallback/Languages/en.ini

@@ -174,6 +174,14 @@ Right Blue=Right Blue
 Right Green=Right Green
 Right Yellow=Right Yellow
 Right White=Right White
+DownLeftFoot=Down Left Foot
+UpLeftFoot=Up Left Foot
+UpLeftFist=Up Left Fist
+DownLeftFist=Down Left Fist
+DownRightFoot=Down Right Foot
+UpRightFoot=Up Right Foot
+UpRightFist=Up Right Fist
+DownRightFist=Down Right Fist
 
 [GameCommand]
 Could not launch web browser.=Could not launch web browser.
@@ -2055,6 +2063,10 @@ Pnm_Nine=9 Button
 Guitar_Five=5 Frets
 Karaoke=Karaoke
 Lights_Cabinet=Lights
+Kickbox_Human=Human
+Kickbox_Quadarm=Quadarm
+Kickbox_Insect=Insect
+Kickbox_Arachnid=Arachnid
 
 [StyleType]
 StyleType_OnePlayerOneSide=1 Player
@@ -2628,6 +2640,10 @@ Pump_Halfdouble=Half-Double
 Pump_Couple=Couple
 Pump_Routine=Routine
 Kb7_Single=KB7
+Kickbox_Human=Human
+Kickbox_Quadarm=Quadarm
+Kickbox_Insect=Insect
+Kickbox_Arachnid=Arachnid
 Ez2_Single=Single
 Ez2_Double=Double
 Ez2_Real=Real
@@ -2663,6 +2679,10 @@ Pump_Halfdouble=Half-Double
 Pump_Couple=Couple
 Pump_Routine=Routine
 Kb7_Single=KB7
+Kickbox_Human=Human
+Kickbox_Quadarm=Quadarm
+Kickbox_Insect=Insect
+Kickbox_Arachnid=Arachnid
 Ez2_Single=Single
 Ez2_Double=Double
 Ez2_Real=Real