fixup tr/stash-format merge