fix all conflicts
paginations for search and categories
Fix small bugs