Update NameGame.py
Resolving merge conflicts