test in dev
add devTest
addMasterTest
conflict
gitMerge
merge with no-ff