upload and conflict pop up improved