HotFix: Fixed merge conflict to enable collections

Fixed incorrect merge conflict in cz.ts that affects loading collections.