fix prints with file instead of content
maintaining relative branch tree structure on rebase