fix classlist/admin
merge