merging with remote files