merge flushInterval with upstream