new matchup appears after vote
replace old matchup with new on vote
fix merge conflicts