fix bug for flow+connection merge, fix record.