updated roles
fix merge conflicts after updation of role