White supremacist pleads guilty to riot conspiracy after charges twice thrown out