https://www.openstreetmap.org/way/173017452 - is border really defined by river? Is changing river course (for example, after flood) automatically changing border?

If no then border and waterway should not be merged.