diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 0042393668..4723e35206 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -796,12 +796,7 @@ 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