brach test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
add on dev state
add on master state
add both state
fix bug 101
merged bug fix 101