[aii] fixes
updated all role in some pages
fixed conflict