Box: Bug fixes with regard to some geometry and type problems
ConflictSets: addAll function for other ConflictSets