merging both uploads