added maps for locations
merge location conflict