merged collectiblemanager and collectibles