add admin page
merge conflict