Adding portal/drone collisions
Merge