user role and design changes
resolved conflict