Update octree
Merge conflict on octree