channel conflicts

2021