Category Model update
Conflict resolved