check winning state (unfinished)
fixed conflicts