Revert "collision merge"

This reverts commit 439e629fad2a8fa01ccfc8c4386f2b57abddcd8e.