fixed origin/spam-command merge

not sure wtf went wrong with merge, but it appears to be fixed