add manage role of user for admin
 fixed conflit merge