[MERGE] - Conflict upload