diff --git a/Gemfile.lock b/Gemfile.lock
index 7291094557c..868f16bd377 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2170,4 +2170,4 @@ DEPENDENCIES
   ziptz
 
 BUNDLED WITH
-   2.4.19
+   2.4.17
diff --git a/app/controllers/explain_controller.rb b/app/controllers/explain_controller.rb
index d03ced68ac1..adb4a4ab7c4 100644
--- a/app/controllers/explain_controller.rb
+++ b/app/controllers/explain_controller.rb
@@ -36,7 +36,7 @@ def access_allowed?
       Rails.env.development?
   end
 
-  helper_method :legacy_appeal?, :appeal, :appeal_affinity, :correspondence?,
+  helper_method :legacy_appeal?, :appeal, :appeal_affinity,
                 :show_pii_query_param, :fields_query_param, :sections_query_param,
                 :treee_fields, :enabled_sections,
                 :available_fields,
diff --git a/app/models/docket.rb b/app/models/docket.rb
index e6b3b0a8ff5..07c14634730 100644
--- a/app/models/docket.rb
+++ b/app/models/docket.rb
@@ -87,14 +87,12 @@ def age_of_n_oldest_genpop_priority_appeals(num)
     ).limit(num).map(&:ready_for_distribution_at)
   end
 
-  def age_of_n_oldest_priority_appeals_available_to_judge(_judge, num)
-    ready_priority_nonpriority_appeals(priority: true, ready: true).limit(num).map(&:receipt_date)
+  def age_of_n_oldest_priority_appeals_available_to_judge(judge, num)
+    ready_priority_nonpriority_appeals(priority: true, ready: true, judge: judge).limit(num).map(&:receipt_date)
   end
 
-  # this method needs to have the same name as the method in legacy_docket.rb for by_docket_date_distribution,
-  # but the judge that is passed in isn't relevant here
-  def age_of_n_oldest_nonpriority_appeals_available_to_judge(_judge, num)
-    ready_priority_nonpriority_appeals(priority: false, ready: true).limit(num).map(&:receipt_date)
+  def age_of_n_oldest_nonpriority_appeals_available_to_judge(judge, num)
+    ready_priority_nonpriority_appeals(priority: false, ready: true, judge: judge).limit(num).map(&:receipt_date)
   end
 
   def age_of_oldest_priority_appeal
diff --git a/app/queries/appeals_non_priority_ready_for_distribution.rb b/app/queries/appeals_non_priority_ready_for_distribution.rb
index 116ab9e587f..81873d8560f 100644
--- a/app/queries/appeals_non_priority_ready_for_distribution.rb
+++ b/app/queries/appeals_non_priority_ready_for_distribution.rb
@@ -41,8 +41,9 @@ def self.ready_appeals
     docket_coordinator.dockets
       .flat_map do |sym, docket|
         if sym == :legacy
-          appeals = docket.ready_to_distribute_appeals.select { |appeal| appeal["aod"] == 0 }
-          legacy_rows(appeals, docket, sym)
+          [] # TODO Add this back
+          # appeals = docket.ready_to_distribute_appeals.select { |appeal| appeal["aod"] == 0 }
+          # legacy_rows(appeals, docket, sym)
         else
           appeals = docket.ready_priority_nonpriority_appeals(priority: false, ready: true)
           ama_rows(appeals, docket, sym)
@@ -50,26 +51,26 @@ def self.ready_appeals
       end
   end
 
-  def self.legacy_rows(appeals, docket, sym)
-    appeals.map do |appeal|
-      veteran_name = FullName.new(appeal["snamef"], nil, appeal["snamel"]).to_s
-      vlj_name = FullName.new(appeal["vlj_namef"], nil, appeal["vlj_namel"]).to_s
-      hearing_judge = vlj_name.empty? ? nil : vlj_name
-      {
-        docket_number: appeal["tinum"],
-        docket: sym.to_s,
-        aod: appeal["aod"] == 1,
-        cavc: appeal["cavc"] == 1,
-        receipt_date: appeal["bfd19"],
-        ready_for_distribution_at: appeal["bfdloout"],
-        target_distro_date: target_distro_date(appeal["bfd19"], docket),
-        days_before_goal_date: days_before_goal_date(appeal["bfd19"], docket),
-        hearing_judge: hearing_judge,
-        veteran_file_number: appeal["ssn"] || appeal["bfcorlid"],
-        veteran_name: veteran_name
-      }
-    end
-  end
+  # def self.legacy_rows(appeals, docket, sym)
+  #   appeals.map do |appeal|
+  #     veteran_name = FullName.new(appeal["snamef"], nil, appeal["snamel"]).to_s
+  #     vlj_name = FullName.new(appeal["vlj_namef"], nil, appeal["vlj_namel"]).to_s
+  #     hearing_judge = vlj_name.empty? ? nil : vlj_name
+  #     {
+  #       docket_number: appeal["tinum"],
+  #       docket: sym.to_s,
+  #       aod: appeal["aod"] == 1,
+  #       cavc: appeal["cavc"] == 1,
+  #       receipt_date: appeal["bfd19"],
+  #       ready_for_distribution_at: appeal["bfdloout"],
+  #       target_distro_date: target_distro_date(appeal["bfd19"], docket),
+  #       days_before_goal_date: days_before_goal_date(appeal["bfd19"], docket),
+  #       hearing_judge: hearing_judge,
+  #       veteran_file_number: appeal["ssn"] || appeal["bfcorlid"],
+  #       veteran_name: veteran_name
+  #     }
+  #   end
+  # end
 
   def self.ama_rows(appeals, docket, sym)
     appeals.map do |appeal|
diff --git a/client/app/styles/caseDistribution/_lever_history.scss b/client/app/styles/caseDistribution/_lever_history.scss
index a958dd55128..79747c626e0 100644
--- a/client/app/styles/caseDistribution/_lever_history.scss
+++ b/client/app/styles/caseDistribution/_lever_history.scss
@@ -7,8 +7,7 @@
   border-color: $color-gray-lighter;
   vertical-align: text-top;
   font-family: Source Sans Pro;
-  font-size: 19px;
-  width: 20%;
+  font-size: 17px;
 }
 
 .lever-history-table-header-styling {
@@ -18,7 +17,7 @@
   border-color: $color-gray-lighter;
   font-family: Source Sans Pro;
   font-weight: 700;
-  font-size: 19px;
+  font-size: 17px;
   line-height: 1.3em/25px;
 }
 
@@ -34,8 +33,14 @@
   table {
     width: 100%;
     margin-top: 0;
+    overflow: auto;
+    display: block;
 
     tr {
+      max-width: 30rem;
+      overflow-x: auto;
+      padding: 1rem;
+      font-size: 1.5rem;
       border-bottom: 1px solid $color-gray-lighter;
 
       th {
diff --git a/db/seeds/ama_affinity_cases.rb b/db/seeds/ama_affinity_cases.rb
index ad394c7a23a..e3c444863d8 100644
--- a/db/seeds/ama_affinity_cases.rb
+++ b/db/seeds/ama_affinity_cases.rb
@@ -84,6 +84,7 @@ def create_set_of_affinity_cases
       end
     end
 
+<<<<<<< HEAD
     def create_hearing_docket_cavc_cases
       judges_with_attorneys.each do |judge|
         # Case in affinity window for both levers where new hearing and previous deciding judge are the same
@@ -108,6 +109,8 @@ def create_hearing_docket_cavc_cases
       end
     end
 
+=======
+>>>>>>> feature/APPEALS-36234
     def judges_with_attorneys
       # use judges with attorneys to minimize how many cases are distributed when testing because the
       # alternative_batch_size is higher than the batch_size for most judge teams
@@ -115,11 +118,14 @@ def judges_with_attorneys
         JudgeTeam.all.reject { |jt| jt.attorneys.empty? }.map(&:judge).compact.filter(&:vacols_attorney_id)
     end
 
+<<<<<<< HEAD
     def hearing_judge
       @hearing_judge ||= User.find_by_css_id("HRNG_JUDGE") ||
         create(:user, :judge, :with_vacols_judge_record, css_id: "HRNG_JUDGE", full_name: "Judge HeldHearing")
     end
 
+=======
+>>>>>>> feature/APPEALS-36234
     # rubocop:disable Metrics/AbcSize
     def create_case_ready_for_less_than_cavc_affinty_days(judge)
       attorney = JudgeTeam.for_judge(judge).attorneys&.filter(&:attorney_in_vacols?)&.first ||
@@ -373,6 +379,7 @@ def create_ama_affinity_cases_set(judge, years_old)
       evidence_submission_cavc_remand.remand_appeal.tasks.where(type: SendCavcRemandProcessedLetterTask.name).first.completed!
       hearing_cavc_remand.remand_appeal.tasks.where(type: SendCavcRemandProcessedLetterTask.name).first.completed!
     end
+<<<<<<< HEAD
 
     def create_hearing_cavc_case_ready_at_n_days_ago(affinity_judge:, hearing_judge:, days_ago:)
       # Go back to when we want the original appeal to have been decided
@@ -411,6 +418,8 @@ def create_hearing_cavc_case_ready_at_n_days_ago(affinity_judge:, hearing_judge:
       # Return the remand appeal to let us track which appeals were created when run from a rails console
       remand
     end
+=======
+>>>>>>> feature/APPEALS-36234
     # rubocop:enable Metrics/AbcSize
   end
 end
diff --git a/db/seeds/users.rb b/db/seeds/users.rb
index e8948f014a3..7d46b5f805a 100644
--- a/db/seeds/users.rb
+++ b/db/seeds/users.rb
@@ -116,6 +116,8 @@ def create_users
       # Below originated in Education seed file
       setup_emo_org
       setup_rpo_orgs
+
+      create_qa_test_users
     end
 
     def create_bva_dispatch_admin
diff --git a/spec/jobs/push_priority_appeals_to_judges_job_spec.rb b/spec/jobs/push_priority_appeals_to_judges_job_spec.rb
index 4e14a485502..258b6c22c8e 100644
--- a/spec/jobs/push_priority_appeals_to_judges_job_spec.rb
+++ b/spec/jobs/push_priority_appeals_to_judges_job_spec.rb
@@ -190,7 +190,7 @@ def to_judge_hash(arr)
           :ready_for_distribution,
           :advanced_on_docket_due_to_age,
           :with_appeal_affinity,
-          uuid: "bece6907-3b6f-4c49-a580-6d5f2e1ca65d",
+          uuid: ready_priority_uuid2,
           docket_type: Constants.AMA_DOCKETS.hearing,
           receipt_date: receipt_date
         )
diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb
index 51102700da2..41c840f7e24 100644
--- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb
+++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb
@@ -234,7 +234,7 @@
           end
         end.to(
           have_performed_job(VirtualHearings::CreateConferenceJob)
-            .exactly(10)
+            .exactly(5)
             .times
         )