Explicitly merge scopes
Explicitly merge scopes

Changes to implicit scoping in Rails 6.0 means that we need to
explicitly merge the scope generated from the type class.

alphagov/whitehall,alphagov/whitehall,alphagov/whitehall,alphagov/whitehall