add merge
merge with no-ff
file1
add file4
Merge branch 'dev'
file5
Merge branch 'dev'