branch test
This is a new branch dev2
AND simple
& simple
conflict fixed
add merge
merge with no-ff
add merge