fix rebase conflicts

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

@@ -15,6 +15,7 @@ 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,6 +29,7 @@ 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),

config/locales/en.yml

@@ -451,7 +451,12 @@ en:
         title: "You told us this person is %{age} or over and not retired"
         hint_text: "The minimum expected retirement age for %{gender} in England is %{age}."
     extra_borrowing:
+<<<<<<< HEAD
       title: "The mortgage and deposit are higher than the purchase minus the discount"
+=======
+      title: "You told us this doesn't include any extra borrowing"
+      hint_text: "The mortgage and deposit are higher than the purchase minus the discount"
+>>>>>>> 65ad4b0b (fix rebase conflicts)
     pregnancy:
       title: "You told us somebody in the household is pregnant"
       no_females: "You also told us there are no female tenants living at the property."