finish random
fix conflict