upstream should reflect same packages as local