do you want to do that now and I'll rebase on top of the new master or do you consolidate it later?