update admin index and routes
fix merge conflicts