Fixing the role for otherRights
Fixing conflict