Three years later, streamflow dispute resolved