I looked at it with JOSM, but it wouldn't let me join the overlapping areas.  AFAIK there is no easy way to fix cause it's two large MPs.  What I have been doing is slowly pulling the MPs apart and splitting them up based off road boundaries.