commit dev
test switch to dev
commit master
update feature
complete