pagination for all pages done
conflict resolved