Update canvas.js

fix conflict