AND simple
& simple
conflict fixed
add merge
merge with no-ff
bug fix 101'
merge bug fix 101