fixed js conflicted bug by 10016022