fix rebase conflicts

app/models/form/sales/subsections/outright_sale.rb

@@ -15,7 +15,6 @@ class Form::Sales::Subsections::OutrightSale < ::Form::Subsection
       Form::Sales::Pages::MortgageLenderOther.new("mortgage_lender_other_outright_sale", nil, self),
       Form::Sales::Pages::MortgageLength.new("mortgage_length_outright_sale", nil, self),
       Form::Sales::Pages::ExtraBorrowing.new("extra_borrowing_outright_sale", nil, self),
-      Form::Sales::Pages::ExtraBorrowingValueCheck.new("extra_borrowing_value_check_outright_sale", nil, self),
       Form::Sales::Pages::AboutDepositWithoutDiscount.new("about_deposit_outright_sale", nil, self),
       Form::Sales::Pages::DepositValueCheck.new("outright_sale_deposit_value_check", nil, self),
       Form::Sales::Pages::LeaseholdCharges.new("leasehold_charges_outright_sale", nil, self),

app/models/form/sales/subsections/shared_ownership_scheme.rb

@@ -29,7 +29,6 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::MortgageLenderOther.new("mortgage_lender_other_shared_ownership", nil, self),
       Form::Sales::Pages::MortgageLength.new("mortgage_length_shared_ownership", nil, self),
       Form::Sales::Pages::ExtraBorrowing.new("extra_borrowing_shared_ownership", nil, self),
-      Form::Sales::Pages::ExtraBorrowingValueCheck.new("extra_borrowing_value_check_shared_ownership", nil, self),
       Form::Sales::Pages::AboutDepositWithDiscount.new(nil, nil, self),
       Form::Sales::Pages::AboutDepositWithoutDiscount.new("about_deposit_shared_ownership", nil, self),
       Form::Sales::Pages::DepositValueCheck.new("deposit_value_check", nil, self),

app/models/validations/sales/soft_validations.rb

@@ -64,10 +64,4 @@ module Validations::Sales::SoftValidations
 
     !grant.between?(9_000, 16_000)
   end
-
-  def extra_borrowing_expected?
-    return unless extrabor && mortgage && deposit && value && discount
-
-    mortgage + deposit > value - value * discount / 100
-  end
 end