AND simple
& simple
conflict fixed
branch of dev
merge with no-ff
fix bug 101
merge bug fix 101