* fix packaging merge