make topics live inside events
resolved merge conflict