merge with upstream
restore missing file
merge