Fixed the way we retrieve and merge multiple files