Merging trees: file system and content integration