Add russian roulette
Fix conflicts