js file fix
js re-fix
merge
js file added back