Merge in new features: categories