fixed jqeury conflict