Removed cookies from playing roulette
Fixed merge conflict