added subscription to collection
resolved merge conflicts