branch test
new Folder
AND simple
&simple
conflict fixed
add merge
merge with no-ff