re add bundles that were deleted in merge fixes