It looks like you've tried to fix the overlapping ways, however https://www.openstreetmap.org/changeset/163884869 showed the intent was to split it into track and trail. I've restored the track deleted here and fixed the overlap.