image on canvas
merge conflic
fix main.js