Fix merge conflict.

diff --cc foundation-database/manifest.js
index 220984b,94b2138..5f7d8ba
--- 1/foundation-database/manifest.js
--- 2/foundation-database/manifest.js
+++ b/foundation-database/manifest.js
@@@ -5,24 -5,16 +5,31 @@@
      "remove from 440_schema.sql everything that's defined here. it's now redundant"
    ],
    "databaseScripts": [
+     "../lib/orm/source/create_xt_schema.sql",
+     "../lib/orm/source/xt/functions/add_column.sql",
+     "../lib/orm/source/xt/functions/add_constraint.sql",
+     "../lib/orm/source/xt/functions/add_index.sql",
+     "../lib/orm/source/xt/functions/add_primary_key.sql",
+     "../lib/orm/source/xt/functions/create_table.sql",
+ 
 +    "public/indexes/apopentax.sql",
 +    "public/indexes/aropentax.sql",
 +    "public/indexes/asohisttax.sql",
 +    "public/indexes/cmheadtax.sql",
 +    "public/indexes/cmitemtax.sql",
 +    "public/indexes/cobilltax.sql",
 +    "public/indexes/cobmisctax.sql",
 +    "public/indexes/cohisttax.sql",
      "public/indexes/evntlog.sql",
 +    "public/indexes/invchead.sql",
 +    "public/indexes/invcheadtax.sql",
      "public/indexes/invcitemtax.sql",
      "public/indexes/shipitem.sql",
 +    "public/indexes/taxhist.sql",
 +    "public/indexes/toheadtax.sql",
 +    "public/indexes/toitemtax.sql",
 +    "public/indexes/voheadtax.sql",
 +    "public/indexes/voitemtax.sql",
  
      "public/types/achline.sql",
      "public/types/apaging.sql",