ENDING CONFLICTS OVER WATER