Add support for merging data in different directories
Fix typo