Settlement reached over water rates