Canvas update
conflicts resolved