fix js conflict, finally