Fixed the canvas
Fixed conflicts