Updated Merges, and upload works