add admin flights create page
fix merge conflicts