add map on location
resovcel conflict