rebase and fix conflicts and tests

spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb

@@ -20,8 +20,8 @@ RSpec.describe Form::Sales::Subsections::IncomeBenefitsAndSavings, type: :model
         buyer_1_mortgage
         buyer_1_mortgage_value_check
         buyer_2_income
-        buyer_2_income_value_check
         buyer_2_income_mortgage_value_check
+        buyer_2_income_value_check
         buyer_2_mortgage
         buyer_2_mortgage_value_check
         housing_benefits

spec/models/form_handler_spec.rb

@@ -52,14 +52,14 @@ RSpec.describe FormHandler do
     it "is able to load a current sales form" do
       form = form_handler.get_form("current_sales")
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(211)
+      expect(form.pages.count).to eq(212)
       expect(form.name).to eq("2022_2023_sales")
     end
 
     it "is able to load a previous sales form" do
       form = form_handler.get_form("previous_sales")
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(211)
+      expect(form.pages.count).to eq(212)
       expect(form.name).to eq("2021_2022_sales")
     end
   end