merging in canvas size changes