Merge with old files