barnch test
AND simple
simple
conflict fixed
add commit content
merge with no-ff
change M
merger bug fix