冲突测试test
测试用新建BFA_test目录
Merge remote-tracking branch 'bfa-sbgl/master'