should I wait until that's merged or rebase my branch against that?