test
merge db and add js folder