branch
AND simple
& simple
conflict fixed
add merge
merge with no-ff
fast merge
merge dev
issue-101
merged bug fix 101