fix merge conflict and finish jsa time series tidying