Fixing conflicts

bot.cfg