add role
solve the conflict