Conflicts: NewKernel_d/include/CGAL/NewKernel_d/functor_tags.h NewKernel_d/test/NewKernel_d/Epick_d.cpp