diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 1f1d293470..0042393668 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -796,7 +796,12 @@ PlayerType="Player"
 PlayerInitCommand=y,SCREEN_CENTER_Y
 StartGivesUp=true
 BackGivesUp=false
+<<<<<<< metrics.ini
+FailOnMissCombo=30
+FailAfter30Misses=false
+=======
 FailOnMissCombo=-1
+>>>>>>> 1.1491
 GivingUpGoesToPrevScreen=false
 GivingUpGoesToNextScreen=false
 InitialBackgroundBrightness=1
@@ -2840,7 +2845,7 @@ Fallback="ScreenAttract"
 NextScreen="ScreenUnlockStatus"
 PrevScreen="ScreenHowToPlay"
 TimerSeconds=-1
-StepsTypesToHide="dance-couple,dance-solo,dance-routine,pump-halfdouble;pump-couple"
+StepsTypesToHide="dance-couple,dance-solo,dance-routine,pump-halfdouble,pump-couple"
 Type="Category"
 CoursesToShow=GetCoursesToShowRanking()
 ShowOnlyMostRecentScores=false