Fix some error in BlackJack.py
merge conflict