# Conflicts: # libs/main/core/pivariant.cpp # libs/main/math/pigeometry.h # libs/main/math/pimathbase.h