change galaxy category to 'packaging'
fix merge conflict