fix rebase conflicts

db/schema.rb

@@ -487,7 +487,6 @@ 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"
@@ -509,6 +508,7 @@ 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"