Upload files
complete merge