fixing category pages
fixing merge