small fix for test
merge branch remote