Fix for conflict....

stepmania/Data/Translation.dat

@@ -41,9 +41,10 @@ TitleFrom: (CanCan XX)|(Can Can XX)|(Kang Kang XX)|(KangKang XX)|(Kang Kang)|(Ka
 TitleTo: Can Can
 ArtistTo: F2 Original
 *
-# So many people like to rape this name...
+# Also...
-ArtistFrom: (.*Banya.*)
+TitleFrom: cancan
-ArtistTo: Banya
+ArtistFrom: F2 Original
+TitleTo: Can Can
 *
 ArtistFrom: (¹ÚÁöÀ±)|(Park Ji Yoon)
 ArtistTo: 박지윤
@@ -54,9 +55,30 @@ ArtistTo: 뱩지옝
 *
 # Lee Hyun Do - Pierrot
 TitleFrom: Pierrot
-ArtistFrom: (Lee Hyun Do)|(Li Hyun Do)
 ArtistTo: 이혠도
 *
+# Lee Hyun Do (most probably)
+ArtistFrom: Lee Hyun Do
+ArtistTo: 이혠도
+*
+# Some versions of People Crew - YahWah have the name the wrong way round
+# people aren't sure who the band is or what the song name is.
+# for the record the band is People Crew (http://www.people-crew.co.kr) and the song
+# is Yahwah
+TitleFrom: People Crew
+TitleTo: YahWah
+ArtistTo: People Crew
+*
+TitleFrom: YahWah
+ArtistTo: People Crew
+*
+TitleFrom: Yah Wah
+ArtistTo: People Crew
+*
+TitleFrom: Flower Of Night
+ArtistTo: People Crew
+TitleTo: YahWah
+*
 # Yu Seung Jun - Hope Find You
 TitleFrom: Hope Find You
 ArtistTo: 유승준

stepmania/src/StepMania.dsp

@@ -92,11 +92,7 @@ LINK32=link.exe
 # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
 # Begin Special Build Tool
 IntDir=.\../Debug6
-<<<<<<< StepMania.dsp
-TargetDir=\Stepmania\stepmania
-=======
 TargetDir=\stepmania
->>>>>>> 1.222
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
 PreLink_Cmds=disasm\verinc                                                                                                                     	cl                                                                                                                      /Zl                                                                                                                      /nologo                                                                                                                      /c                                                                                                                      verstub.cpp                                                                                                                      /Fo$(IntDir)\