Revert "Revert "collision""

This reverts commit 813d937fa61ad221f32b11adc9615b8146e007e3.