branch dev now work
branch 111
master 222
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101