6becf3c46c
Resolve merge conflict in rbac.ts: keep PR branch logic (try userId first, then fall back to staff.id) rather than base branch's staff.id-only approach. Co-Authored-By: Paperclip <noreply@paperclip.ing>