Removed all collision pairing.
Fixed merge conflict.