Fixed bad merge change in cb_conferences