update in branch dev
updateed
add new feature
Merge branch 'dev'
delete
Merge branch 'dev'
master
dev
conflict
fix some bugs
Merge branch 'bug'