fix merge conflicts

diff --cc foundation-database/manifest.js
index faa09c4,f8939d5..24f5094
--- 1/foundation-database/manifest.js
--- 2/foundation-database/manifest.js
+++ b/foundation-database/manifest.js
@@@ -1014,9 -1019,11 +1021,13 @@@
  
      "public/tables/bankrecitem.sql",
      "public/tables/cashrcpt.sql",
+     "public/tables/ccpay.sql",
+     "public/tables/ccbank.sql",
+     "public/tables/checkhead.sql",
 +    "public/tables/itemsite.sql",
 +    "public/tables/location.sql",
      "public/tables/metric.sql",
+     "public/tables/payco.sql",
      "public/tables/priv.sql",
      "public/tables/tax.sql",
      "public/tables/taxpay.sql",
@@@ -1627,7 -1636,6 +1639,8 @@@
      "public/tables/report/items.xml",
  
      "public/patches/fixacl.sql",
 -    "public/patches/populate_ccpay_card_type.sql"
++    "public/patches/populate_ccpay_card_type.sql",
 +
 +    "public/tables/setVersion.sql"
    ]
  }

diff --cc foundation-database/public/functions/balanceitemsite.sql
index ee02560,3ae61d0..87d9ddf
--- 1/foundation-database/public/functions/balanceitemsite.sql
--- 2/foundation-database/public/functions/balanceitemsite.sql
+++ b/foundation-database/public/functions/balanceitemsite.sql
@@@ -44,4 -45,15 +42,4 @@@ BEGI
    RETURN 1;
  
  END;
- $$ LANGUAGE plpgsql;
 -$$ LANGUAGE 'plpgsql';
++$$ LANGUAGE plpgsql;

diff --cc foundation-database/public/tables/metasql/salesOrderItems-list.mql
Simple merge

diff --cc foundation-database/public/tables/setVersion.sql
index 8d468a4,0000000..bf8d03a
mode 100644,000000..100644
--- 1/foundation-database/public/tables/setVersion.sql
--- /dev/null
+++ b/foundation-database/public/tables/setVersion.sql
@@@ -1,1 -1,0 +1,1 @@@
- SELECT setMetric('ServerVersion', '4.5.0Beta');
++SELECT setMetric('ServerVersion', '4.7.0Beta');