new map embed
Resolved conflict