branch dev
and simple
& simple
conflict fixed
branch dev no--ff
merge with no-ff
issue-101
fix bug-101