adjust table.sql and build script
resolve conflict