fixed default channel issue
fixed merge conflicts