merge
Building getWinner()
fixed merge conflict