fix js after merge