Fix delete and upload after merge