this is now old
places merged
fixed merge issue for maps, places