branch test
AND simple
&simple
conflict fixed
add merge
merge with no-ff
bug issue-01 fixed
merge fixed bug 01
keep working
keep moving