MediaWiki:Userrights-conflict

From base48

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