Collide: Static
Merge Conflict correction