Conflicts: library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h library/PolyVoxCore/source/Impl/ErrorHandling.cpp