Fix merge conflict
admin is done thru kick