download and conflict pop up updated