Core/AI: Fixed merge error