Upon further review, it seems to be working

PHYS-16 #time 5m

After a full clean and build, I got all the merges to happen without
issue.
Trying to do collisions in Octree method

PHYS-16 #time 5m

This doesn't seem to be working right now, even though I'm doing it a
dumb, straightforward way that negates most of the Octree's benefits.