Added merging of local files