mark added something new to myfile.txt in master
Merge branch 'master' into dev
changed in master
Merge branch 'master' into Dev