File upload merge