branch test again
AND simple
& simple
conflict fixed
add merge
merge with no-ff
repair successfully
Merge branch 'dev'