AND simple
AND simple1.
& simple
conflict fixed
add try
merge with no-ff
fix bug 101
merged bug fix 101
branch test
Merge branch 'dev'
% simple