code review: collections specs
resolve conflict
resolve conflict