fix merge
manage category as entity