Update index.js and uncomment jquery in util.js
Resolve merge conflict