more efficient jquery
conflict merge
fixes