fixing javascript conflicts