Merge "Detect user rights conflicts"