Fix merge errors and re-add the channellist OSD