edit master
edit dev
edit dev second
edit master second
Merge branch 'dev'