fix a merge problem in the js file