update admin page
eliminated conflict