run migration

db/schema.rb

@@ -10,11 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
 ActiveRecord::Schema[7.0].define(version: 2022_09_29_105157) do
-=======
-ActiveRecord::Schema[7.0].define(version: 2022_09_27_144455) do
->>>>>>> 4cbe8d92 (add type of building question to sales)
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -343,10 +339,10 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_27_144455) do
     t.string "sex1"
     t.integer "buy1livein"
     t.integer "buylivein"
+    t.integer "builtype"
     t.integer "proptype"
     t.integer "age2"
     t.integer "age2_known"
-    t.integer "builtype"
     t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
     t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
     t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"