we'll need to be careful ordering and rebasing merges here :)