fix rebase conflicts

db/migrate/20230120163049_add_deposit_and_mortgage_value_check_to_sales_logs.rb

@@ -0,0 +1,5 @@
+class AddDepositAndMortgageValueCheckToSalesLogs < ActiveRecord::Migration[7.0]
+  def change
+    add_column :sales_logs, :deposit_and_mortgage_value_check, :integer
+  end
+end

db/schema.rb

@@ -487,6 +487,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_26_145529) do
     t.integer "hoyear"
     t.integer "fromprop"
     t.integer "socprevten"
+    t.integer "mortlen"
     t.integer "mortgagelender"
     t.string "mortgagelenderother"
     t.integer "extrabor"
@@ -508,7 +509,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_26_145529) do
     t.integer "old_persons_shared_ownership_value_check"
     t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id"
     t.integer "shared_ownership_deposit_value_check"
-    t.integer "mortlen"
     t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
     t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"
     t.index ["updated_by_id"], name: "index_sales_logs_on_updated_by_id"