[fix] update bootstrap + fix collide