load js files
merge conflict