Updated channel and time series
Fixed merge