rename files
merge