branch test
ADD simple
ADD simple
conflict fixed
add merge
merge with no-ff