Made collisionMap deque
Merged conflict