Roles merge fix