Add category column to product
Actastaggableon categories
resolve conflicts