Added garbage-barrier collisions
Merge