branch test
AND simple
& simple
conflict fixed
delete blank lines
add merge
merge with no-ff
delete add merge
fix but 101
merged bug fix 101