added a check to prevent an only superadmin from changing revoking own superadmin status
fixed merge conflicts