Legislation Seeks End to Water War