End in sight for river water wars