Check jquery cdn links on heroku
fixed merge conflict