Collision and dimensionality
Fix merge conflict