fixed paginatino from merge