fix conflicts in channels_new