modify on branch newf
update newb
another update newb
merge xingtest1-newb