fixing winning condition
merge conflicts