fix image path when not mounted at root
specify subtree merge

not sure if this will fix the missing-files case we just saw