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