add a new file
add new file in master
add new file in dev branch
Merge branch 'dev'

triple merge