create a new branch dev
AND simple
& simple
conflict fixed
use --no-ff
merge with no-ff
No using no-ff
Merge branch 'dev'
fix bug 001
merged bug fix bug 001