dev branch add
and test
and test master
conflict fixed