fixed merged conficts, removed duplicate apis, and map_canvas