add common
add something on branch dev2
mod on branch dev1
mod on branch master
conflict fixed
mod readme.md
merge with --no-ff
fix bug issue-101
merge branch issue-101
mod readme.md
commit mod
commit mod