create admin
update_admin
resolve merge conflicts and add nav bar in admin