Fixing conflicts

pyBot.py