merger with esri master