Deal ends fight over clean water fund in Suffolk