resolved a conflict
just finished with file upload
add main .js