diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 0f38c0bdcf..40c701b2bf 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -2066,6 +2066,9 @@ done_checking_hopo:
 				// XXX This is the wrong combo for shared players. STATSMAN->m_CurStageStats.m_Player[pn] might work but could be wrong.
 				const bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo > int(BRIGHT_GHOST_COMBO_THRESHOLD);			
 				if( m_pNoteField )
+<<<<<<< .mine
+					m_pNoteField->DidTapNote( col, bBlind? TNS_W1:score, bBright );
+=======
 				{
 					/* We need to make sure all notes have the same ghost row score if blind is on,
 					 * otherwise you can still tell what the score on the note was if the flash is
@@ -2075,6 +2078,7 @@ done_checking_hopo:
 					else
 						m_pNoteField->DidTapNote( col, score, bBright );
 				}
+>>>>>>> .r27467
 				if( score >= TNS_W3 || bBlind )
 					HideNote( col, iRowOfOverlappingNoteOrRow );
 			}