canvas added to asset pipeline
merge fix
merge fix