Packaging merge now seems correct