branch test
AND simple
& simple
confilict fixed
add new text
merge with no-ff
abc
Merge branch 'dev'
abcd
Merge branch 'dev'
d