fix packages from previous merge