fixing channel merge bug