merge
delete files
rename folder
t