update:add categories for supplier and manufacturer
update:comflict remove