switched to local maps.json
resolved conflicts