add merge
merge with no-ff
my ff
my FF
conflict fixed ff
delete autoadd line
another ff.
Merge branch 'dev'
delete FF
delete ff
Merge branch 'dev'
 add line 8
add line eight
conflict fixed
add line nine
delete some git diff line
add line ten
Merge branch 'dev'

merge dev add line ten.
master add line 11.
dev add line eleven.