make sure the uploaded file exists
merge from upstream
conflict resolve