branch dev
feature1
this is master
before fix
merge and update