update tips
merge with tmp_forMatch