刚被冲的改下
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test_regress/src/as_test_regress_v2.py