jquery
fixing conflicts