fixed two id in admin error
merge conflicts