Introduce collision
Fixup
Merge branch 'collision-feature'