change file on dev
change file on master
delete change on master