fixed js after merge