randomizeCard update
merge fix