CONFLICT RESOLUTION (view entire LOG message to see):

GAMEMANAGER. we did different fixes. I merged the best of both ;)
EZ2DANCER columns now aligned correctly
EZ2DANCER stage screen stylization now underway
NOTE: This Release WILL NOT COMPILE. Some Members of RAGELOG and RAGESOUND have disappeared, and I don't know where to.

stepmania/src/ScreenSelectMusic.cpp

@@ -30,7 +30,7 @@
 #include "AnnouncerManager.h"
 #include "InputMapper.h"
 #include "GameState.h"
-
+#include "ScreenEz2Stage.h"
 
 const float SONG_INFO_FRAME_X	= 160;
 const float SONG_INFO_FRAME_Y	= SCREEN_TOP+118;
@@ -324,8 +324,14 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 		else
 		{
 			MUSIC->Stop();
-
-			SCREENMAN->SetNewScreen( new ScreenStage );
+			if (GAMESTATE->m_CurGame != GAME_EZ2)
+			{
+				SCREENMAN->SetNewScreen( new ScreenStage );
+			}
+			else
+			{
+				SCREENMAN->SetNewScreen( new ScreenEz2Stage );
+			}
 		}
 		break;
 	case SM_PlaySongSample: