jackbus
The admin borders here are confusing. I know what the problem is I just don't know how to fix them in OSM.

 ALL of Corrales is in Sandoval Co. Almost all of Rio Rancho is in Sandoval Co. except three parcels here and Qual/Black Ranch. Intel is NOT in Rio Rancho but is in Sandoval Co.

My main concern is if it were done incorrectly, it would mess up the search features, and maybe routing.