combined two js files