fix roles updating issue
roles updating fixed
resolve conflicts