adding categories
fixing merge conflicts
adding terms