including jquery properly
merge