Check if somebody has won works
Fixed conflicts and win check works