Re-uploading existing file was failing

The context_info contains a conflicts hash or a conflicts array depending on the number of conflicts. We should make sure we handle both cases correctly.