```ruby
class AboutLoa1Controller < ApplicationController
  layout 'slides', except: [:choosing_a_company]

  def index
    @tailored_text = current_transaction.tailored_text
    render 'about/about'
  end

  def certified_companies
    @loa1_idps = IDENTITY_PROVIDER_DISPLAY_DECORATOR.decorate_collection(current_identity_providers_for_loa)
    render 'about/certified_companies_LOA1'
  end

  def identity_accounts
    render 'about/identity_accounts_LOA1'
  end

  def choosing_a_company
    render 'about/choosing_a_company'
  end
end
```

Fix merge conflict by including ViewableIdpPartialController
user
```ruby
require 'partials/viewable_idp_partial_controller'

class AboutLoa1Controller < ApplicationController
  include ViewableIdpPartialController

  layout 'slides', except: [:choosing_a_company]

  def index
    @tailored_text = current_transaction.tailored_text
    render 'about/about'
  end

  def certified_companies
    @loa1_idps = IDENTITY_PROVIDER_DISPLAY_DECORATOR.decorate_collection(current_identity_providers_for_loa)
    render 'about/certified_companies_LOA1'
  end

  def identity_accounts
    render 'about/identity_accounts_LOA1'
  end

  def choosing_a_company
    render 'about/choosing_a_company'
  end
end
```
assistant