Category View Implementation
resolved conflicts
resolved the conflicts