Merge branch 'stuff'
work1
work2
work3
Merge branch 'work'
stuffedit 1
stuffedit 2