AND simple
$ simple
conflict fixed
add merge
merge with no-ff
fix bug 191
merged bug fix 191
test end
a