add flag merge by dev02