add spambot
fix merge