Update files for merge.