mapping canvas
fix
merge
merge