add location_admin
add location_admin
merge