merge
admin vs logs