alert modal and map on welcome
merge fix