changes pagination, edit link and delete link in each page
conflict removed