update admin
fix conflict