Minimax implemented
Fixed conflicts