Fixed roulette flow
Resolved conflict during roulette integration