fix conflicts
add nassh_deps.concat.js which includes all depencency js file