fixed merging and inanimate collisions