troop version bumped up for tests
argument naming and annotation in Collection
Collection API change, .mergeWith() and .asType()
dessert version bumped up to 0.2.5 in tests
conflict resolution for collections