Correct bugs working AI but not good
Merge conflicts