Fix warning with CUDA 6.5
Another conflict fix
Finishing KDTree3