Fix

Conflicts:
	bot.php