done category page changes
resolved conflict