fix packages after merge