fix js conflit