jqury conflict resolved