added other adm value
fixed conflicts?