class ShopsController < BaseController
  layout 'darkswarm'
  before_filter :load_active_distributors

  def index
  end
end

class ShopsController < BaseController
  layout 'darkswarm'

  def index
  end
end

Remove load_active_distributors call missed by merge
Remove load_active_distributors call missed by merge
