Hi. Yes, the two former union territories of "Dadra and Nagar Haveli" and "Daman and Diu" were merged to become "Dadra and Nagar Haveli and Daman and Diu" last year. "Dadra and Nagar Haveli" now is one of the territory's three districts, with "Daman" and "Diu" being the other two. "Daman and Diu" is no longer its own entity. Feel free to correct me if I did something wrong or if I missed something. I'm only sporadically active on OSM, my main field of contribution is Wikipedia.

osm.wiki/WIWOSM

sure about the Armenia-Azerbaijan border?