branch dev1 test
and simple
& simple
conflict fixed
add 1 of dev
merge with no-ff
fix bug 101
merged bug fix 101