fixed bug xxx
fixed bug
new feature
Merge remote-tracking branch 'origin/master' into dev
updated xxx
updated new feature
bugfix3
Merge remote-tracking branch 'origin/master' into dev
done new feature