[MERGE] - conflict upload