Delete the last line.
branch text
delete the colon
AND simple
& simple
conflict fixed
add merge
merge with no-ff
XXXXXXXXXXXXXX
Merge branch 'dev'
DDDDDD
Merge branch 'dev'