do stuff
master stuff
more master stuff
Merge branch 'origin/work'