fix a few style on your channel
fixed merge conflict