AND simple
AND simple
conflict fixed
delete and simple
merge with no-ff
fix bug 101
merged bug fix 101