Fixed the issue where if no one answers correctly then noone can win
Fixed merge issues