add admin
fix merge