branch add
add feature1
add master
merged
add merge
merge with no-ff
fix bug 101