MediaWiki:Userrights-conflict

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