Fixed problems and merge conflict in the canvas