Commented out brute force single player
Fixed conflicts