make some changes of test
merge remote branch master to local master