something changed
add branch dev
edit from dev
edit from master
edit from master and dev