Remove conflict
Move the JQuery and canvas script