added slug field to ProductCategory
fixed merge conflict