brance test
And simple
% simple
conflict fixed
add merge
merge with no--ff