Merge "Clarify userrights-conflict"