Cloud to octree
Merge error
Merge conflicts