And simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug-001
merged bug fix 001
develop case 7 done
develop case 7 done