class PartialSolutionBinPack
conflict resolved