update javscript error after merge.