MediaWiki:Userrights-conflict

From Yade

Conflict of user rights changes! Please review and confirm your changes.