Fish or farms? A new battle rages over California water