now that we have the manager, it makes sense to move this to the manager
Merge remote-tracking branch 'origin/master'