some stuff
Merge remote branch 'origin/dev'
Merge remote branch 'origin/master' into dev