add tdb.js
fix conflicts